Merge branch 'master' of https://github.com/ycx211314/ienglish

Conflicts:
	english/templates/index.html