reformatted
completed story
Merge branch 'master' into temp