master
Merge branch 'master' of github.com:jeantroiani/get_a_room
prepare for heroku
fix image issues