。。。
Merge remote-tracking branch 'origin/master'
。
Merge remote-tracking branch 'origin/master'
change
Merge remote-tracking branch 'origin/master'

Conflicts:
	ipa/.DS_Store
Merge branch 'master' of github.com:Tolecen/FreeLottery
laaa