updates to stuff

stuff
Merge branch 'hugh' of https://github.com/craigmoliver/mist7571-team_awesome into hugh

Conflicts:
	webapp/login.html