before merge
before merge
Merge branch 'master' of github.com:liuzenan/MusTale

Conflicts:
	MusTale/en.lproj/MainStoryboard.storyboard