T.T
Merge branch 'master' of https://github.com/harryzhanghr/jump21

Conflicts:

game.xcodeproj/project.xcworkspace/xcuserdata/YiChen.xcuserdatad/UserInt
erfaceState.xcuserstate