Removed abstract
Merge branch 'master' of https://github.com/j-dasilva/se1-project
Removed abstract to give children getter/setter privs