changes to models
Merge branch 'master' of https://github.com/justm/teamProject_wolfdogs