stoopid heroku
gallery controller and model, image model and relationship
git conflict