remove heroku gem
Merge branch 'master' of github.com:kjozawa/ymnk-app

Conflicts:
	Gemfile.lock