Octopress init
Site updated at 2014-07-15 18:53:02 UTC
Merge branch 'master' of https://github.com/charlesreid1/charlesreid1.github.io

Conflicts:
	atom.xml
	blog/2014/04/07/yet-another-how-i-set-up-octopress-with-github-pages-post/index.html
	blog/2014/04/08/new-pojects/index.html
	blog/2014/04/09/starred-github-repositories/index.html
	blog/2014/04/10/math-on-octopress/index.html
	blog/2014/04/10/the-ghost-of-c-plus-plus-past/index.html
	blog/2014/04/11/d3-and-octopress/index.html
	blog/2014/04/11/octo-iframe/index.html
	blog/2014/04/11/starred-github-repositories-science/index.html
	blog/2014/04/12/spotify-january-playlist/index.html
	blog/2014/04/22/my-current-projects-chemical-engineering-projects/index.html
	blog/2014/04/22/my-current-projects-personal-github-repositories/index.html
	blog/2014/04/22/my-current-projects-photography-projects/index.html
	blog/2014/04/24/my-current-projects-electronics-and-hacking/index.html
	blog/2014/04/24/my-current-projects-mnemonics/index.html
	blog/2014/04/24/my-current-projects-writing/index.html
	blog/2014/05/07/watergate-twitterbot-101/index.html
	blog/2014/05/09/imaginary-friends-my-flock-of-twitterbots/index.html
	blog/2014/05/20/the-ginsberg-bot-flock/index.html
	blog/2014/05/21/oauth-from-python/index.html
	blog/2014/05/22/oauth-from-python2/index.html
	blog/2014/05/23/oauth-from-python3/index.html
	blog/archives/index.html
	blog/page/2/index.html
	blog/page/3/index.html
	github-repos/index.html
	index.html
	sitemap.xml
	stylesheets/screen.css