update
Merge branch 'master' of https://github.com/jackluo1981/hellogit

Conflicts:
	index.html