Refactoring data model
Merge pull request #19 from melissa-kam/master

Refactoring data model.