UML
new jive
Merge branch 'master' of https://github.com/Dustinschie/Tracking

Conflicts:

Tracking.xcodeproj/project.xcworkspace/xcuserdata/dustinschie.xcuserdata
d/UserInterfaceState.xcuserstate
	bin/Tracking.app/Contents/MacOS/Tracking
	src/testApp.cpp