Hypot in the collide code area
Removed old commented out section of the collide in ant
updated the ignore file
Merge branch 'master' of https://github.com/samsath/Colonise.git

Conflicts:
	src/Tim's main.py