Adds getters and setters
Commit before merge. bjmcmorran sjhalloran pcbiggs mrracine arlund sjlong (pair programming with code on projector)
Merge branch 'Iteration-1-dev' into Iteration-1-dev-GUI