Automated commit at 2014-06-18 17:53:03 UTC by middleman-deploy 0.1.2
Automated commit at 2014-06-19 15:39:43 UTC by middleman-deploy 0.1.2
Automated commit at 2014-06-19 15:40:08 UTC by middleman-deploy 0.1.2
Merge branch 'master' of https://github.com/jswatson0/jswatson0.github.io into source

Conflicts:
	sitemap.xml.gz