Modified gemfile.
Merge branch 'master' of https://github.com/aligature/wishlist

Conflicts:
	Gemfile.lock