just for sync
Merge branch 'master' of https://github.com/Leongum/WalkFun_IOS

Conflicts:
	WalkFun.xcodeproj/project.pbxproj