Two
Merge branch 'dev'
Merge branch 'master' of https://github.com/wosilove/gameGit into dev

Conflicts:
gameGit.xcodeproj/project.pbxproj
Merge branch 'dev'
Merge branch 'master' of https://github.com/wosilove/gameGit

Conflicts:
	gameGit.xcodeproj/project.pbxproj