Added setters/getters
Merge branch 'master' of github:chewett/COMP6205