git test 2
Merge branch 'master' of https://github.com/eddyli/Lucky

Conflicts:
	.gitignore
	Lucky.iml