1

1
Merge branch 'master' of https://github.com/WatermelonMusic/BigWatermelon

Conflicts:
	WatermelonMusic/WatermelonMusic.xcodeproj/project.pbxproj

WatermelonMusic/WatermelonMusic.xcodeproj/project.xcworkspace/xcuserdata
/ty.xcuserdatad/UserInterfaceState.xcuserstate
	WatermelonMusic/WatermelonMusic/WAMainView.h
	WatermelonMusic/WatermelonMusic/WAMainView.m