fix git
Merge branch 'master' of https://github.com/dmmxzz/lottery

Conflicts:
	.idea/compiler.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	lottery.iml