proba
Merge branch 'master' of https://github.com/malkowskiaron/intelligent_house

Conflicts:
	Test/src/com/example/Vilagitas.java