Modificaciones de último momento
Merge origin/master

Conflicts:
	DisenoDeSistemas/nbproject/project.properties
Merge origin/master
Merge origin/master

Conflicts:
	DisenoDeSistemas/nbproject/project.properties
Merge origin/master
Merge origin/master

Conflicts:
	DisenoDeSistemas/nbproject/project.properties