added login
Merge branch 'master' of https://github.com/dschien/shareapp

Conflicts:
	templates/html/add.html
	templates/index.html
Merge branch 'master' of https://github.com/dschien/shareapp

Conflicts:
	templates/html/add.html
	templates/index.html