Final CHanges
Merge branch 'master' of https://github.com/curtterpschool/MyFiles

Conflicts:

MyFiles.xcodeproj/project.xcworkspace/xcuserdata/curtterpstra.xcuserdata
d/UserInterfaceState.xcuserstate