app and templates
Merge branch 'master' of https://github.com/chriskim511/Monfils
merged conflicts
Conflicts:
	templates/login.html~