Testing and trial
Fix conflicts
Fixed Annotation images
Merge pull request #84 from CMPUT301F13T05/annotations

Annotations