:>
:>
>
^^
Merge branch 'master' of https://github.com/xpush/xpush.github.io

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

Conflicts:
	index.html
Merge branch 'master' of https://github.com/xpush/xpush.github.io
remove confilct