Signed-off-by: friendlykai <friendlykai@hotmail.com>
Merge branch 'master' of https://github.com/AceHalo/AceHalo.github.io

Conflicts:
	index.html
Merge branch 'master' of https://github.com/AceHalo/AceHalo.github.io

Conflicts:
	index.html

Signed-off-by: friendlykai <friendlykai@hotmail.com>