Merge branch 'gh-pages' of https://github.com/wushuyi/mytank

Conflicts:
	index.html