Making some changes
Merge branch 'master' of https://github.com/tstraylor/explored

Conflicts:

explored.xcodeproj/project.xcworkspace/xcuserdata/tst.xcuserdatad/UserIn
terfaceState.xcuserstate