Marco Quezada 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
..
controllers 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
factories 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren
app.js 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request vor 11 Jahren