fixed data model, removed branches
Merge pull request #1 from magicalbanana/mylifesucks

fixed data model, removed branches