update
Merge branch 'gh-pages' of https://github.com/EdmundLuk/appHomepage

Conflicts:
	README.md
	index.html