iMac before merge
Merge branch 'master' of https://github.com/Forest05/TTQ

Conflicts:

DDX.xcworkspace/xcuserdata/Forest.xcuserdatad/UserInterfaceState.xcusers
tate

DDX.xcworkspace/xcuserdata/Forest.xcuserdatad/xcdebugger/Breakpoints_v2.
xcbkptlist
	KQ/Managers/BeaconManager.m
	KQ/ViewController/NavigationViewController.m