update gems
update gems
Merge branch 'master' of heroku.com:tricle-afeld

Conflicts:
	Gemfile.lock