First Commit
Merge branch 'master' of https://github.com/Roy-Graafmans/CI.git

Conflicts:
	src/SWARM/Ants.java