Octopress init
Site updated at 2014-05-07 18:47:57 UTC
Site updated at 2014-05-07 18:55:03 UTC
Merge branch 'master' of https://github.com/codeforgreenville/codeforgreenville.github.io

Conflicts:
	blog/archives/index.html
	javascripts/github.js
	stylesheets/screen.css
merging branches so i can deploy
Site updated at 2014-05-07 19:04:01 UTC