updated controller
Merge branch 'master' into models
Merge pull request #3 from bchiatt/models

Models