Automated commit at 2013-08-21 05:52:03 UTC by middleman-deploy 0.1.2
Automated commit at 2013-08-21 05:52:47 UTC by middleman-deploy 0.1.2
Merge branch 'master' of github.com:paperboy-all/paperboy-all.github.io

Conflicts:
	index.html
Merge branch 'master' into middleman

Conflicts:
	index.html