Merge branch 'master' of https://github.com/agatadebska/SuperFarmer

Conflicts:
	src/resources/Przycisk.java
Merge branch 'master' of https://github.com/agatadebska/SuperFarmer