Pre-live push
Merge branch 'master' of https://github.com/strangerpixel/strangerpixel.github.com

Conflicts:
	css/bootstrap.css
	index.html