reorganized files into new directories
Merge branch 'master' of https://github.com/budgielover/rat-tracker
deleted some unused variables
Merge remote-tracking branch 'upstream/master'

this should have the updated data model in it
:wq

:q