sync
Merge branch 'master' of https://github.com/jfoshee/hack-houston-bikes

Conflicts:
	MyMap.xcodeproj/project.pbxproj