Offline now working again, added some minmal stuff to annotations, working on publishing
Fix merge with Master
Merge pull request #80 from CMPUT301F13T05/annotations

Annotations