Automated commit at 2014-04-21 18:17:27 UTC by middleman-deploy 0.2.3
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	index.html