i did do things
Merge branch 'master' of https://github.com/sashalives/busbike

Conflicts:
	Bike&Bus/Bike&Bus.xcodeproj/project.pbxproj