Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge pull request #3 from jmmaloney4/dev

Dev
Merge branch 'dev'
Merge branch 'master' of https://github.com/jmmaloney4/xpkg
updates
Merge branch 'dev'
Merge branch 'dev'
updates
updates
Merge branch 'dev'

Conflicts:

src/xpkg/xpkg.xcodeproj/project.xcworkspace/xcuserdata/jack.xcuserdatad/
UserInterfaceState.xcuserstate
updates
Merge branch 'dev'

Conflicts:

src/xpkg/xpkg.xcodeproj/project.xcworkspace/xcuserdata/jack.xcuserdatad/
UserInterfaceState.xcuserstate
slight fix with coloring