Learning cucumber & route adjustment
Merge branch 'master' of https://github.com/etuchscherer/Jolly

Conflicts:
	Gemfile.lock