please make sure i didn't overwrite anything
Merge branch 'master' of https://github.com/Stephanie-Chou/HATShaiti

Conflicts:
	css/HATSstyle.css