Merge pull request #6 from BusTicker/Fixes-#5

Added map view controller
Added current location button
Adding in CoreLocation
added custom location manager
rebase with master
Merge branch 'Fixes-#5' of https://github.com/BusTicker/BusTicker-iOS into Fixes-#5

Conflicts:
	BusTicker/BusTicker.xcodeproj/project.xcworkspace/xcuserdata/brennan.xcuserdatad/UserInterfaceState.xcuserstate