Colocando travis
Merge branch 'dev'
[Master] Arrumando Gemfile para Heroku

Signed off by: Lucas G Gassert <lggassert@gmail.com>
Merge branch 'dev'
Merge branch 'dev' into merge

Conflicts:
	Gemfile.lock
Faltou um conflito