Delete story should work.
Adding bookmark deletion to AuthorController
Delete bookmark with story
Merge branch 'delete' of github.com:edegraff/adventure.datetime into edegraff
Slight modification
Merge branch 'delete' of github.com:edegraff/adventure.datetime into delete
Deleting fragments work.. I think..
Merge remote-tracking branch 'james/server' into serverthing
Merge remote-tracking branch 'james/server' into serverthing
Changing get story to check server cache
Merge pull request #84 from Jtfinlay/delete

Delete
Merge branch 'master' into server

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryModelDirector.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Merge branch 'serverthing' of github.com:edegraff/adventure.datetime into server