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

Conflicts:
	algorytm.cpp
	algorytm.h
	algorytm2.h
	kometascene.cpp
	main.cpp
	mainwindow.cpp
	mainwindow.h
	mainwindow.ui
	planeta.cpp
	pszt.pro
	pszt.pro.user
	symulation.cpp
	symulation.h
	wiadomosc.h