tapei101
Merge branch 'master' of github.com:wpsteak/Bikeable

Conflicts:
	Ubike.xcodeproj/project.pbxproj