Revamp several of the files to make collision detection cleaner
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/server/main/Server.java