Cosas raras del git, no sé qué pasa
Merge branch 'master' of https://github.com/srgrr/PROP

Conflicts:
	Demiurg/nbproject/private/private.properties