Merge branch 'master' of https://github.com/bineanzhou/Lottery360

Conflicts:
	.gitignore

Signed-off-by: bineanzhou <bineanzhou@163.com>
Merge branch 'master' of https://github.com/bineanzhou/Lottery360