Merge branch 'master' of https://github.com/francisyang1991/NUhackathon

Conflicts:
	index.html