Cambio el gemfile
Merge branch 'master' of heroku.com:scholaris-test

Conflicts:
	Gemfile