updated for new model development with getters and setters
Merge branch 'master' of https://github.com/anthonyjchriste/makeke