Changes made by James Cam (jamescam59@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git
Changes made by James Cam (jamescam59@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git

Conflicts:
	E4Cabs/customerSearch.html
Changes made by James Cam (jamescam59@gmail.com).
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git
Merge branch 'master' of https://github.com/itsnaveen/ECabsProject.git
Changes made by James Cam (jamescam59@gmail.com).
Changes made by James Cam (jamescam59@gmail.com).
Changes made by James Cam (jamescam59@gmail.com).
Changes made by James Cam (jamescam59@gmail.com).