Commit for code school class
Merge branch 'master' of github.com:roca/AngularJS