teste git
Merge branch 'master' of github.com:Teuth/omrails

Conflicts:
	Gemfile
Revert "teste git"

This reverts commit 13e4e91d7c31baf2cb54e267e3da2a4ee5a6a704.
 merge branches
 rails v 4.0.0 fix with heroku gemfiles