some changes to class diagram
changed illustrationManager to mediaManager, changes to database schema (a little simpler now)
mend
choice manager and class, finished chapter, edits to db contract
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
choice stuff, changes to other classes
update choice stuff
Added view story, modified add story activities
Modified story activity to accomodate xml
Added View Story Activity java code
general controller framework
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
updates to test story manager and uml
Added some dummy activity files
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
changed testPhoto/Illustration managers to test media manager
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
take photo activity added (stub)
Changed the main activity, added a spinner
Update choice, and tests