changes to style.css
Merge branch 'master' of github.com:benloustau/tourist_project
fixed input conflict
Merge branch 'master' of github.com:benloustau/tourist_project