Update Gemfile source
Update dependencies
Add Readme
Update versions
Add Ruby 2.1.0 to Gemfile
Resolve merge conflicts
Merge branch 'master' of git://github.com/heroku/ruby-sample

Conflicts:
	Gemfile