Site updated at 2014-09-02 20:01:32 UTC
Site updated at 2014-09-02 20:02:52 UTC
Site updated at 2014-09-02 20:03:44 UTC
Site updated at 2014-09-02 20:04:35 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/2014/07/15/packaging-flask-apps-as-submodules/index.html
	blog/2014/08/05/hello-world-photo-post/index.html
	blog/2014/08/07/the-problem-with-duck-typing/index.html
	blog/2014/08/21/calculating-correlation-coefficient-with-c-plus-plus/index.html
	blog/2014/08/31/kernel-density-functions-and-the-oakland-athletics/index.html
	blog/archives/index.html
	blog/categories/allen/atom.xml
	blog/categories/allen/index.html
	blog/categories/authentication/atom.xml
	blog/categories/authentication/index.html
	blog/categories/baseball/atom.xml
	blog/categories/baseball/index.html
	blog/categories/blog/atom.xml
	blog/categories/blog/index.html
	blog/categories/c-plus-plus/atom.xml
	blog/categories/c-plus-plus/index.html
	blog/categories/cantera/atom.xml
	blog/categories/cantera/index.html
	blog/categories/chemical/atom.xml
	blog/categories/chemical/index.html
	blog/categories/code/atom.xml
	blog/categories/code/index.html
	blog/categories/coefficient/atom.xml
	blog/categories/correlation/atom.xml
	blog/categories/d3/atom.xml
	blog/categories/d3/index.html
	blog/categories/duck/atom.xml
	blog/categories/duck/index.html
	blog/categories/ducktyping/atom.xml
	blog/categories/ducktyping/index.html
	blog/categories/electronics/atom.xml
	blog/categories/electronics/index.html
	blog/categories/engineering/atom.xml
	blog/categories/engineering/index.html
	blog/categories/ginsberg/atom.xml
	blog/categories/ginsberg/index.html
	blog/categories/gist/atom.xml
	blog/categories/github/atom.xml
	blog/categories/github/index.html
	blog/categories/graph/atom.xml
	blog/categories/graph/index.html
	blog/categories/hacking/atom.xml
	blog/categories/hacking/index.html
	blog/categories/iframe/atom.xml
	blog/categories/iframe/index.html
	blog/categories/javascript/atom.xml
	blog/categories/javascript/index.html
	blog/categories/latex/atom.xml
	blog/categories/latex/index.html
	blog/categories/legged/atom.xml
	blog/categories/legged/index.html
	blog/categories/math/atom.xml
	blog/categories/math/index.html
	blog/categories/mathjax/atom.xml
	blog/categories/mathjax/index.html
	blog/categories/music/atom.xml
	blog/categories/music/index.html
	blog/categories/oauth/atom.xml
	blog/categories/oauth/index.html
	blog/categories/octopress/atom.xml
	blog/categories/octopress/index.html
	blog/categories/pantera/atom.xml
	blog/categories/pantera/index.html
	blog/categories/photography/atom.xml
	blog/categories/photography/index.html
	blog/categories/programming/atom.xml
	blog/categories/programming/index.html
	blog/categories/projects/atom.xml
	blog/categories/projects/index.html
	blog/categories/python/atom.xml
	blog/categories/python/index.html
	blog/categories/sabermetrics/atom.xml
	blog/categories/sabermetrics/index.html
	blog/categories/scipy/atom.xml
	blog/categories/scipy/index.html
	blog/categories/statistics/atom.xml
	blog/categories/statistics/index.html
	blog/categories/theory/atom.xml
	blog/categories/theory/index.html
	blog/categories/three/atom.xml
	blog/categories/three/index.html
	blog/categories/twitter/atom.xml
	blog/categories/twitter/index.html
	blog/categories/twitterbots/atom.xml
	blog/categories/twitterbots/index.html
	blog/categories/typing/atom.xml
	blog/categories/typing/index.html
	blog/categories/watergate/atom.xml
	blog/categories/watergate/index.html
	blog/categories/writing/atom.xml
	blog/categories/writing/index.html
	blog/page/2/index.html
	blog/page/3/index.html
	github-repos/index.html
	index.html
	sitemap.xml