Made some changes to create an admin login
Merge branch 'master' of https://github.com/nickpope/commpute into admin-login

Conflicts:
	commpute.py
Made some changes to store user info in db
Merge branch 'admin-login'