Merge branch 'master' of https://github.com/snaden/assassinsFrontend

Conflicts:
	www/login.html