Getters and setters in place.
Merge branch 'master' of https://github.com/jmh511/Cmpt280