commit pedodata page
Merge branch 'master' of https://github.com/TaylorLi/GETOBJ

Conflicts:
	Pedometer/Pedometer.xcodeproj/project.pbxproj