Bumped rails version
Merge branch 'master' of github.com:jwood/karate-journal

Conflicts:
	config/environment.rb