Gemfile merge.
RubyMine added to gitignore.
Merge branch 'master' of https://github.com/laze/sinatra-startup