rozne takie
Merge branch 'master' of https://github.com/pezet/mas-projekt

Conflicts:
	project/src/project/Main.java
	project/src/project/modele/Firma.java
	project/src/project/modele/ZakladKamieniarski.java