23
Merge branch 'master' of https://github.com/Leongum/WalkFun_IOS

Conflicts:
WalkFun.xcodeproj/project.pbxproj
c
Merge branch 'master' of https://github.com/Leongum/WalkFun_IOS