Annotations now working without images
Added Loading Window, need to add some message still
Merge branch 'master' of https://github.com/CMPUT301F13T05/Team05_CYOA into annotations
Merge pull request #77 from CMPUT301F13T05/annotations

Annotations