test
Merge pull request #1 from agetzell/controller/model

test