ready for merge
Merge branch 'development'
Merge branch 'development'
master
Merge branch 'master' of github.com:jeantroiani/get_a_room
updated logo and added file of it
merging from development
Merge branch 'development'
Merge branch 'master' of https://github.com/jeantroiani/get_a_room
prepare for heroku
fix image issues
Changed name on the tab
Merge branch 'master' of https://github.com/jeantroiani/get_a_room