El meu canvi
Merge branch 'master' of https://github.com/montoya46/GBD

Conflicts:
	src/Conflicto.java