C test

c
add test function

add test function
Merge branch 'Justin-Test'

Conflicts:

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

a