today's work
Merge branch 'master' of https://github.com/sashalives/busbike

Conflicts:
	Bike&Bus/Bike&Bus/TransitRequestsController.m
working on table
Merge branch 'master' of https://github.com/sashalives/busbike