css update
Merge branch 'master' of https://github.com/griffiths/like

Conflicts:
	css/main.css
	static-output.html