Merge branch 'master' of https://github.com/RonghaiMa/ak47

Conflicts:
	html/index.html