funcionalida agregada
funcionalida agregada
funcionalida agregada
Merge origin/master

Conflicts:
	SchoolServer/nbproject/private/private.properties