Proyecto base para comenzar
Merge branch 'master' of https://github.com/jgarceso/DisegnoSoftware

Conflicts:
	test commit.txt