CSS changes
Merge branch 'master' of https://github.com/delak/CHNonthego

Conflicts:
	dev/parse/public/style/style.css