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