Bugfixes
Fixed Collision
Merge branch 'master' of https://github.com/JuraX/ParticleSim.git

Conflicts:
	src/GUI.py
	src/ParticleManager.py