added natalie branch
took off string
Add Readfile for Lexer
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player into lijuan
Add empty file 'hi' for testing
merged conflict
Readfile function for Lexer
Added tests for end condition for iterator + Added the whole list of TokenTypes
update LexerFile and FileReader
Merge branch 'javier' of https://github.com/javiersuweijie/ABC-player into natalie
merged with lijuan
Merge branch 'master' into javier
removed bugged doc
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