data model
Merge pull request #1 from manonthemat/master

data model