edit style.css
Merge branch 'master' into gh-pages

Conflicts:
	style.css
style.css
Merge branch 'gh-pages'