changed QueMaster to handle multiple voices
refactored note length parser
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player
fixed fur_elise repeat problem
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player
Key is no longer treated as a note, but is set on the Parser
update version Lexer, solve comment problem
fix merge conflict ReadFile
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player
Solve error in ReadFile.java
Merge pull request #14 from javiersuweijie/lijuan

Solve error in ReadFile.java
hmmmm
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player
hacked some magical values to make it work
refactored QueMaster to include NoteParser
Corrects accidental parsing
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player

Conflicts:
	src/Parser/NoteParser.java
changed magic modifier
Fixes unresolved conflicts
Refixed stuff