David Leonard a1bcbca275 Refactoring out navbar from front-end %!s(int64=10) %!d(string=hai) anos
..
addons a1bcbca275 Refactoring out navbar from front-end %!s(int64=10) %!d(string=hai) anos
partials b2109e8e40 Updating AngularJS Front-end %!s(int64=10) %!d(string=hai) anos
scripts b2109e8e40 Updating AngularJS Front-end %!s(int64=10) %!d(string=hai) anos
bower.json 2a73b55a99 Fixed various merge conflicts pertaining to the prevention of the pull request %!s(int64=10) %!d(string=hai) anos
index.html b2109e8e40 Updating AngularJS Front-end %!s(int64=10) %!d(string=hai) anos