styled comments
Merge branch 'master' of https://github.com/hallme/scaffolding

Conflicts:
	css/style.css