Added AuthorController.
Also added methods to IStoryModelDirector
Added to StoryManagaer
Added more skeleton code to StoryManager.
Will implement when StoryDB is done.
Added to StoryManager
Added more skeleton code to StoryManager.
Will implement when StoryDB is done.
Merge branch 'master' of https://github.com/edegraff/adventure.datetime
Commiting so I can test something else.
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime
Commiting changes so I can test pull request.
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime into controller
Finished AuthorController
Fixing whitespace
Adding getStoriesAuthoredBy method.
Modifying AuthorController
Implemented more UserController
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime into controller

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/controller/UserController.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryModelDirector.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Small changes to AuthorController
Making small adjustments based off feedback
Merge pull request #56 from edegraff/controller

Controllers
Merge remote-tracking branch 'origin/master' into DatabaseTests

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/controller/UserController.java
Merged origin/master, initialized storyMedia in StoryFragment constructors
Merge branch 'DatabaseTests' into PrePopDatabase

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Story.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java