finished html/css

tidied up html and css files
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
fixing weirdness with git push

Fixing git problems. :D