Stash merge conflict in
* app/scripts/view.js
* app/scripts/main.js
* app/index.html
Fixed menu error and added getusername to template
Commiting error fixes and merge conflicts