Rozdzielenie Mockupów na Mockup (dla view) i ZkmMockup. Potworzone Mockupowe obiekty
Merge branch 'master' of https://github.com/kuuubrak/PublicTransportSimulator

Conflicts:
	src/model/Bus.java
	src/view/ClientWrapper.java
	src/zkm/ZkmMain.java
Merge branch 'master' of https://github.com/kuuubrak/PublicTransportSimulator