Pulled in more octopress goodness.
Removed old files
Overhaul of UI, style adjustments, included waves.js
Adjusted YAML frontmatter to include disqus comments
Fixed path in app.scss
Release 0.04, Updated README
Fixed my name
Initial Heroku
Looking for green
Changed asset version
testing..
Testing to see if codeship pushes compiled project to heroku
Remvoing deploy folder from source
Goofed. Removed deploy folder from workspace, and from gitignore.
Second goof.
Apparently Heroku needs /deploy/
Merge branch 'master' into heroku
Updated to 0.0.4, started Docs
Update Remote Changes

Conflicts:
	_config.yml
	deploy/about/index.html
	deploy/categories/news/atom.xml
	deploy/categories/news/index.html
	deploy/contact/index.html
	deploy/feed.xml
	deploy/index.html