fixed user stories
Merge branch 'master' of https://github.com/chewett/COMP6205