Annotations are displayed with author tag and optional captions; saves and loads correctly.. HOORAY
Merge branch 'master' of https://github.com/CMPUT301F13T06/ClassProject