Modify .gitignore
Fix merge conflict
Merge branch 'ModesLexerParser' of github.com:Jdhaimson/abcmusicplayer into ModesLexerParser
fixed some bugs in MusicBodyPlayer
Merge branch 'ModesLexerParser' of github.com:Jdhaimson/abcmusicplayer into ModesLexerParser