Revert "Commiting so I can test something else."

This reverts commit d81aab991743286193af3087468d181b75ecd045.
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryModelDirector.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/Interfaces/IStoryModelDirector.java
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Merge branch 'master' of https://github.com/CMPUT301F13T03/adventure.datetime

Conflicts:
	adventure.datetime/src/ca/cmput301f13t03/adventure_datetime/model/StoryManager.java
Added stuff to StoryManager for bookmarks
Set default bitmap for Story when saving.
Minor adjustments
Initial UserControllerTest
Small modifications based off Jesse's feedback
Taking out logging I missed
Merge pull request #59 from edegraff/bookmark

Bookmark Stuff