css changes
Merge branch 'master' of https://github.com/lpatmo/codeplusplus

Conflicts:
	static/css/css.css