Having a look
Merge branch 'master' of https://github.com/samsath/Colonise.git

Conflicts:
	src/particles.py