Updated Model UML
Merge branch 'master' into Docs
Updated views in UML
Merge pull request #60 from Jtfinlay/master

UML View update! With a preview!
Seperated out Database, Story, etc.
reset main UML to master
Added preview for UML
Caught some mistakes
Merge branch 'master' of github.com:CMPUT301F13T03/adventure.datetime
Fixing bookmarks
Merge branch 'Docs' into ControllerDoc
Updated ALL THE UML
Merge pull request #62 from Jtfinlay/authorshit

Authorship!
Merge pull request #61 from afontaine/Docs

Added UML for database and model, plus preview
Choice can now be created.
Merge branch 'master' of github.com:CMPUT301F13T03/adventure.datetime
Merge branch 'master' into authorshit