commit for pull
Merge branch 'master' of github.com:yyjhao/NUSMorge

Conflicts:
	public/index.html