Test
Merge branch 'master' of https://github.com/HHSCode/EscapeTheSchool

Conflicts:

SchoolEscape.spritebuilder/SchoolEscape.xcodeproj/project.xcworkspace/xc
userdata/Connor.xcuserdatad/UserInterfaceState.xcuserstate