Multiple changes
Merge branch 'master' of https://pezet@github.com/pezet/mas-projekt.git

Conflicts:
	project/src/project/Main.java
	project/src/project/modele/ZakladPogrzebowy.java
Merge branch 'master' of https://pezet@github.com/pezet/mas-projekt.git
Merge branch 'master' of https://pezet@github.com/pezet/mas-projekt.git
Merge branch 'master' of https://pezet@github.com/pezet/mas-projekt.git
Dodana klasa Wynajem.