What
Merge branch 'master' of https://github.com/kirumang/Lotto

Conflicts:
	Lotto.pro.user
Lotto.User

Lotto.User
UnCommit