git merge --squash octopress/master initialization
installed bootstrap theme
Merge branch 'release/0.0.1'