Annotations now are Server loaded
Fix merge conflicts
Merge pull request #83 from CMPUT301F13T05/annotations

Annotations