small style
Merge branch 'master' of github.com:benjamincharity/temp

Conflicts:
	css/all.css