comit
Merge branch 'master' of https://github.com/vinhtran1691/project

Conflicts:
	html/home-doctor.html