pulling
Merge branch 'master' of https://github.com/sashalives/busbike

Conflicts:
	Bike&Bus/Bike&Bus.xcodeproj/project.pbxproj
	Bike&Bus/Bike&Bus/AppDelegate.h
	Bike&Bus/Bike&Bus/TransitRequestsController.h