Updated models and controllers
Blah
Merge branch 'master' of github.com:milene/techypreppy