conflict issues
Merge branch 'master' of github.com:benloustau/tourist_project