Javadoc
Ya pinta
Ya pinta
Ya pinta
Merge upstream/MVCprueba

Conflicts:
	TenisApp/src/tenis/logic/PaintAdministrator.java