Css and index updates
Merge branch 'master' of https://github.com/FinnOConnor/1992dreamteam

Conflicts:
	css/main.css