pull master

pull master
Merge branch 'master' of https://github.com/ozakiJustin/OMusic

Conflicts:

OMusic/OSinger.xcodeproj/project.xcworkspace/xcuserdata/apple.xcuserdata
d/UserInterfaceState.xcuserstate