updates
Merge branch 'gh-pages' of https://github.com/fleecehop/murmurs into gh-pages

Conflicts:
	index.html
	style.css