Merge branch 'master' of https://github.com/g79664/AOC2

Conflicts:

Project1/Project1.xcodeproj/project.xcworkspace/xcuserdata/Tyler.xcuserd
atad/UserInterfaceState.xcuserstate
update