more fluid
Merge branch 'gh-pages'

Conflicts:
	style.css
color and background
Merge branch 'master' into gh-pages