Automated commit at 2014-06-17 19:44:54 UTC by middleman-deploy 0.1.2
Merge branch 'source' of https://github.com/jswatson0/jswatson0.github.io into source
Merge branch 'master' of https://github.com/jswatson0/jswatson0.github.io into source

Conflicts:
	index.html
	jason_watson_resume.pdf
	javascripts/application.js
	sitemap.xml.gz
	stylesheets/application.css
	stylesheets/base.css
	stylesheets/foundation_and_overrides.css
	stylesheets/landing-page.css
	stylesheets/portfolio.css
	stylesheets/syntax.css
Merge branch 'source' of https://github.com/jswatson0/jswatson0.github.io into source