Add Readfile for Lexer
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player into lijuan
Add empty file 'hi' for testing
Readfile function for Lexer
Changed README and added the html form of the token table
update LexerFile and FileReader
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
Merge pull request #5 from javiersuweijie/natalie

Natalie
Added NoteParser and Note Object
Added NoteParser and Note Object
added octave test
merged
Improved octave parsing
Parses can now find the base note in Note Tokens