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

Conflicts:
	main.cpp
ui
merge