prepare_rails_admin
solved conflits
Merge pull request #37 from CarolineCC/Heroku

Heroku