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