holaaa
habitatge amb enum
Merge remote-tracking branch 'origin/master'
Barri ara siiiii
Merge branch 'master' of https://github.com/marclopes/restrictionhell
Merge branch 'master' of https://github.com/marclopes/restrictionhell
hola
Merge branch 'master' of https://github.com/marclopes/restrictionhell

Conflicts:
	src/barri/CtrBarriDom.java