lost file
Merge branch 'master' of https://github.com/cherishlau/OSX

Conflicts:

SwiftStatusBar/SwiftStatusBar.xcodeproj/project.xcworkspace/xcuserdata/a
pple.xcuserdatad/UserInterfaceState.xcuserstate