#4 ok first version
Merge branch 'master' of https://github.com/dam4256/MassiveTribble

Conflicts:
	massive-tribble/src/com/foragers/mt/entities/Circle.java