afegit publics contructors i completat capceleras dominigeneral
barri
Merge branch 'master' of https://github.com/marclopes/restrictionhell

Conflicts:
	src/barri/Barri.java