hopefully adding real login/register functionality
Merge branch 'master' of github.com:zhangmarvin/stash

Conflicts:
	website/static/js/main.js