Changes for Heroku
Merge branch 'master' of github.com:Zmo/treeniapp

Conflicts:
	Gemfile.lock
changes...