Merge branch 'master' of https://github.com/jasonbeck2001/Public

Conflicts:

Labyrinth/Labyrinth.xcodeproj/project.xcworkspace/xcshareddata/Labyrinth
.xccheckout
asdf