belu angular
Merge branch 'master' of github.com:javrod83/dsdp_site

Conflicts:
	app/index.html