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