Set up Octopress framework
Test post
Manual merge
Fix
Fix
rake test