login stuff

login
Merge branch 'master' into Login

Conflicts:
	Quiz Website/WebContent/login.html
delete
login framework
Merge pull request #8 from kmblake/Login

Login