smrdim
Merge branch 'master' of https://github.com/hainj/PT.git

Conflicts:
	PT_Seminarka/src/pack/Simulace.java