init
fix
Merge branch 'master' of github.com:james0zan/james0zan.github.io into gh-pages

Conflicts:
	index.html