html update
Merge branch 'master' of https://github.com/CooperAtive/goalkeeper

Conflicts:
	index.html
	public/css/index.css
	public/css/login.css