Update Gemfile.lock
Merge branch 'master' of github.com:marcomedina/lotipico
Add procfile
setup database
Compile true
Merge branch 'master' of github.com:marcomedina/lotipico

Conflicts:
	config/database.yml
Merge branch 'master' of github.com:marcomedina/lotipico
Merge branch 'master' of github.com:marcomedina/lotipico
Merge branch 'master' of heroku.com:lotipico

* 'master' of heroku.com:lotipico:
  Compile true
  setup database
  Add procfile
  Update Gemfile.lock