css changes
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	css/bootstrap.css
	css/style.css