Improve view1
Merge branch 'master' of https://github.com/juampi/angular-class

Conflicts:
	ex1/app.css
	ex1/view1/view1.js