hola
Merge branch 'master' of https://github.com/marclopes/restrictionhell
hola

Conflicts:
	src/barri/CjtEdificis.java
	src/barri/Edifici.java
	src/barri/Habitatge.java
	src/barri/Negoci.java
	src/barri/Servei.java