Solve the conflict issuse
Merge branch 'Description'
Merge branch 'master' of github.com:amritdeep/TouristGuide
Create scaffold for image, description & secondary and maintian assocation with all
Merge branch 'master' into Description