bike
Merge branches 'master' and 'master' of github.com:wpsteak/Bikeable

Conflicts:
	Ubike.xcodeproj/project.pbxproj
	Ubike/SCMainViewController.m