hi

hi
Merge branch 'master' of https://github.com/kwokh/studyNow

Conflicts:
	index.html