music + time synced
Merge branch 'master' of https://github.com/GeorgeL9/GLTurntable

Conflicts:

Turntable/Turntable.xcodeproj/project.xcworkspace/xcuserdata/George.xcus
erdatad/UserInterfaceState.xcuserstate

Turntable/Turntable.xcodeproj/xcuserdata/George.xcuserdatad/xcdebugger/B
reakpoints_v2.xcbkptlist
	Turntable/Turntable/GLTurntableControl.m