CtrDomGeneral tancat
Merge branch 'master' of https://github.com/marclopes/restrictionhell.git
Pre Codi Tancat
dfasd
commit per fer mergeº
Merge branch 'master' of https://github.com/marclopes/restrictionhell

Conflicts:
	src/barri/Main.java
	src/barri/RDistTipus.java
putjat driver carlos
Merge branch 'master' of https://github.com/marclopes/restrictionhell