fixed run error in build.xml
Added ability for a melody to be created from a text file
Removed unnecessary file
Added comments
Edited javadoc comment
Update README.md
fixed merge conflict
Fixed possible error with junit
Merge pull request #15 from bronhuston/master

Issue #7: Added ability to create a Melody from a file