stories that are on server should now update when published is pressed again. Also changed randomChoice field of chapter to boolean from string....
async task wasnt working with junit, moved the async part out of serverManager class and into activity.
fixed merge conflicts
changed manifest to not use holderapplication, everything was kinda broken lol
chapter tests pass
chapter manager tests pass
choice tests passong
choice manager tests pass
editchapteractivity tests pass
editstoryactivity tests pass
server manager tests passing, refactored shcontroller and story,choice,media, chapter so they can actually update themselves and add themselves to database. still need to apply changes to the rest of code