fannys changes
Merge branch 'master' of https://github.com/bettyleung/SisSTEM

Conflicts:
	index.html
fannys changes2