chnages to index page
resolved conflict
changes to main
Merge branch 'master' of github.com:benloustau/tourist_project