1w
Merge branch 'master' of https://github.com/dymx101/MucixDown

Conflicts:

MucixDown/MucixDown.xcworkspace/xcuserdata/fx.xcuserdatad/UserInterfaceS
tate.xcuserstate