What the fuck is it
Merge branch 'master' of https://github.com/sinholic/dixonsgame

Conflicts:

dixonsgame.xcodeproj/project.xcworkspace/xcuserdata/mahar.xcuserdatad/Us
erInterfaceState.xcuserstate