Merge branch 'master' of https://github.com/fancyzero/FEX

Conflicts:

FEXMac.xcodeproj/xcuserdata/fancyzero.xcuserdatad/xcschemes/xcschememana
gement.plist