Resolving merge conflicts; integrating front end code to back end
adding files for login page, and momento list page. Adding bootstrap library
Merge branch 'master' of git://github.com/indigofire/momentos
resolving merge conflicts in app.yaml