updated_feb_25
Merge branch 'master' of https://github.com/YuchengTuYCT/HCI_P1

Conflicts:
	proj1/travel_site/login.html
Merge branch 'master' of https://github.com/YuchengTuYCT/HCI_P1