Did a lot of awesome shit

awesome shit includes, but is not limited to:

-despawning
-overlap prevention

I guess when you just go out and say it it really isn't that awesome
Merge branch 'master' of https://github.com/CaelanRP/TipTap

Conflicts:
	src/game/Client.java