Materias 21:00
Merge branch 'master' of https://github.com/hmcampoverde/SGA

Conflicts:
	SGA/nbproject/private/private.xml