VIEW 1
Merged master/fixed conflict
Merge branch 'master' of https://github.com/juampi/angular-class