local change
Merge branch 'master' of github.com:JackWuCode/jackwucode.github.com

Conflicts:
	index.md