conflict reolsved
Merge branch 'master' of github.com:afzallakdawala/tours