added natalie branch
took off string
merged conflict
Merge branch 'javier' of https://github.com/javiersuweijie/ABC-player into natalie
Added key mapping and key mapping test
Merge pull request #5 from javiersuweijie/natalie

Natalie