Fixed Steph's unecessary changes
Added final mockup image
added search feature
Refactored some names due to group disaproval
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
updates to class diagram, updated names from everyone
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
added image button to edit chapter
add image button cont
Still workign
Changed add image to add illust
Added linking chapters together with choices
fixed some documentation in back end
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
didn't mean to
Added Choice Linking
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
Fixed merge conflict issues that broke the illustration button
Removed unecessary imports
deleted storyhoardApplication (no one was using it), and fixed the arrows in the class diagram + added some view methods and attributes