Created relationship table
Minor changes
Merge branch 'master' of github.com:benloustau/tourist_project
delete old relationship table
resolved merge conflicts in main.rb