Classe principal(teste) deletada
Classe principal deletada
Merge branch 'master' of https://github.com/emilianoeloi/vitrinedoconhecimento

Conflicts:
	build/web/WEB-INF/classes/com/una/vdc/principal/Principal.class