Octopress init
Site updated at 2014-07-18 17:28:42 UTC
Site updated at 2014-07-18 17:30:40 UTC
Site updated at 2014-07-18 17:32:11 UTC
Merge branch 'master' of github.com:jam1401/jam1401.github.io

Conflicts:
	about/index.html
	atom.xml
	blog/2014/02/15/lets-start-this-up/index.html
	blog/archives/index.html
	blog/categories/test/atom.xml
	blog/categories/test/index.html
	crossdomain.xml
	humans.txt
	index.html
	robots.txt
	sitemap.xml
	stylesheets/screen.css
Site updated at 2014-07-18 17:36:17 UTC