Moved model definition to controller.js
Merge branch 'master' of https://github.com/jappeace/javascript-angular-hw-client-7