Merge branch 'gh-pages'

Conflicts:
	css/styles.css
	fat-daddios.html
	halftone.html
	img/city-scape.jpg
	index.html
	jacks-note.html
	js/scripts.js
	moto-graphics.html
	thirty-bands.html