hopefully this works
Merge branch 'master' of https://github.com/lechnir/Nusic

Conflicts:

Nusic.xcodeproj/project.xcworkspace/xcuserdata/mjmayank.xcuserdatad/User
InterfaceState.xcuserstate