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

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