added natalie branch
took off string
Add empty file 'hi' for testing
merged conflict
Merge branch 'javier' of https://github.com/javiersuweijie/ABC-player into natalie
Merge branch 'master' of github.com:javiersuweijie/ABC-player

Conflicts:
	Token Types.docx
Merge branch 'master' into lijuan
Merge branch 'master' of github.com:javiersuweijie/ABC-player

Conflicts:
	.gitignore
Fixed .gitignore conflict
Merge branch 'javier'

Conflicts:
	.gitignore
Added key mapping and key mapping test
Merge pull request #5 from javiersuweijie/natalie

Natalie
Added NoteParser and Note Object
Added QueMaster class and tests
added NoteEvent class and added more tests to QueMaster
added more variables and voice handling