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

Conflicts:

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