updated data modeling again
Merge pull request #1 from kellygajewski/kellybranch

updated data modeling again