Merge pull request #76 from CMPUT301F13T05/annotations

Annotations
Merge branch 'master' of https://github.com/CMPUT301F13T05/Team05_CYOA into annotations