Merge pull request #29 from kneekey23/nicole

Nicole
model for response mapping
Merge branch 'master' into nicole