bug fixes to adding annotations, file name changes, and small change in es write/read
Merge branch 'master' of https://github.com/CMPUT301F13T06/ClassProject