please work!!
Merge branch 'gh-pages' of https://github.com/liching21/Emeralds into gh-pages

Conflicts:
	about-us.html
	css/core.css
	index.html