s

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

Conflicts:

WatermelonMusic/WatermelonMusic.xcodeproj/project.xcworkspace/contents.x
cworkspacedata

WatermelonMusic/WatermelonMusic.xcodeproj/xcuserdata/geimin.xcuserdatad/
xcschemes/WatermelonMusic.xcscheme

WatermelonMusic/WatermelonMusic.xcodeproj/xcuserdata/geimin.xcuserdatad/
xcschemes/xcschememanagement.plist
	WatermelonMusic/WatermelonMusic/AppDelegate.m

WatermelonMusic/WatermelonMusic/Images.xcassets/AppIcon.appiconset/Conte
nts.json

WatermelonMusic/WatermelonMusic/Images.xcassets/LaunchImage.launchimage/
Contents.json
	WatermelonMusic/WatermelonMusic/WatermelonMusic-Info.plist
	WatermelonMusic/WatermelonMusic/WatermelonMusic-Prefix.pch
	WatermelonMusic/WatermelonMusic/en.lproj/InfoPlist.strings
	WatermelonMusic/WatermelonMusic/main.m
	WatermelonMusic/WatermelonMusicTests/WatermelonMusicTests-Info.plist
	WatermelonMusic/WatermelonMusicTests/WatermelonMusicTests.m
	WatermelonMusic/WatermelonMusicTests/en.lproj/InfoPlist.strings