slight change
deal the merge confliction
Merge branch 'master' of github.com:foxking0416/DanceDanceNoir
fix bug