added public files
Merge conflict resolved
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
Merge branch 'master' of https://github.com/cmckee-dev/DPL-Capstone
added models
Merge pull request #9 from rsoto1/models

Still not sure what the "name" model is for but everything else looks great! I'll merge this and talk to you about it tomorrow.
resolve merge conflicts in schema.rb