Merge branch 'master' into JoshWork
Merge branch 'master' into JoshWork
Trying to set random choice checkbox in EditChapterActivity
Got checkbox to display in xml

Throwing me errors before
Implemented allow random choice in EditChapterActivity
Trying to get allow random choice to work

Somethings happend to view all chapters
Added comment
Help from Alex
Merge branch 'JoshWork'
Merge branch 'master' into JoshWork
Debugging
Merge branch 'JoshWork'
Modified EditChapter before pull and merging
handled merge conflict with randomchoice
no longer creates a new copy of published story when you download it
stories that are on server should now update when published is pressed again. Also changed randomChoice field of chapter to boolean from string....
Refactored entire application to use LifecycleData singleton instead of HolderApplication
Merge branch 'master' of https://github.com/CMPUT301F13T13/StoryHoard
async task wasnt working with junit, moved the async part out of serverManager class and into activity.
fixed merge conflicts