Updated data model including feedback from presentation
Merge branch 'master' of https://github.com/budgielover/rat-tracker
Merge remote-tracking branch 'upstream/master'

this should have the updated data model in it
:wq

:q
some commit
jjj