text
Merge branch 'master' of https://github.com/Stephanie-Chou/HATShaiti

Conflicts:
	HATShaiti_index.html
	css/HATSstyle.css