12312
Merge branch 'gh-pages' of https://github.com/francisyang1991/NUhackathon into gh-pages

Conflicts:
	index.html