solved conflicts2
accolade ajoutée dans paperclip
add links in home page and book a flat in flat view
Merge pull request #21 from maximevita/add-links-to-welcome-page

Add links to welcome page
merged with master
added image upload migration
added empty pictures controller
some improvements with Thomas, need to review the routes
Merge pull request #22 from maximevita/settling-bookings

Settling bookings
moving to new branch
fixing css prod
we can add photos to flat
solve route conflict
Merge pull request #23 from maximevita/add-pictures-to-flats

Add pictures to flats
improved faker
Merge branch 'master' of github.com:maximevita/rbnb into improve-faker
Merge pull request #24 from maximevita/improve-faker

Improve faker
added logo