models and validations
Merge branch 'master' into eldon
removed my view changes
Merge pull request #3 from empowerchris/eldon

Eldon