Update Gemfile
Merge branch 'master' of https://github.com/Mouarius/TheFrog

Conflicts:
	Gemfile