axa fixed
Merge branch 'master' of https://github.com/axacheng/snail

Conflicts:
	templates/index.html