Fix broken style.css
Merge remote-tracking branch 'origin/test'

Conflicts:
	css/style.css
Messed up