adding rake to the Gemfile
Merge branch 'master' of github.com:orlando/svbtle-jekyll
gemfile.lock changed
resolve conflict