Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
..
controllers 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
factories 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden
app.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 jaren geleden