Joe comeback commit
Merge branch 'master' of https://github.com/j03m4r13/iOSBTek

Conflicts:
	.DS_Store
	Tracker.xcodeproj/project.xcworkspace/xcuserdata/joemariealiling.xcuserdatad/UserInterfaceState.xcuserstate