Create rails app on jruby
Merge branch 'master' of github.com:amberbit/KarmaTracker

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	db/schema.rb
Merge to master