resolved
Merge branch 'master' of github.com:anandwebonsie/trip-planner