12.3
Merge branch 'master' of https://github.com/dbjiasb/HappyRunner

Conflicts:

HappyRunner.xcodeproj/project.xcworkspace/xcshareddata/HappyRunner.xcche
ckout