Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 vuotta sitten
..
app.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 vuotta sitten
controllers.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 vuotta sitten
services.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 10 vuotta sitten