css cleanup
Merge branch 'master' of github.com:nscamp/nscamp.github.io

Conflicts:
	_site/css/main.css
	css/main.css