gemfile modify
gemfile modify
gemfile modify
Merge branch 'master' of heroku.com:koresol

Conflicts:
	Gemfile.lock