layout changes
Merge branch 'gh-pages'

Conflicts:
	css/style.css
	index.html