wyswietlanie
Merge branch 'master' of https://github.com/quetz05/pszt

Conflicts:
	mainwindow.cpp
	mainwindow.h
	symulation.h