added natalie branch
took off string
Add empty file 'hi' for testing
Delete Token Types.docx
Delete ABC notation.docx
merged conflict
Split lexed and tokenisation
Create README.md
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player into javier
added .gitignore to ignore all .DS_Store and binary files
Merge pull request #2 from javiersuweijie/javier

Split lexed and tokenisation
Merge branch 'master' of https://github.com/javiersuweijie/ABC-player into javier
Changed README and added the html form of the token table
Added tests for end condition for iterator + Added the whole list of TokenTypes
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