David Leonard b2109e8e40 Updating AngularJS Front-end 11 rokov pred
..
controllers 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 rokov pred
factories 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request 11 rokov pred
app.js b2109e8e40 Updating AngularJS Front-end 11 rokov pred