angularjs views

and custom scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/views/desarrollo.html
	app/views/soluciones.html
Views