angular funcional
Merge branch 'master' of https://github.com/Transmigrado/Veginning

Conflicts:
	views/mainview.html