trying a new branch
Chris
Collision has a Map<Integer, ArrayList<Vector3f>> so collisions can be
tied to their node heights
texture update
Changed collision distance to .25f
jfjfj
using the proper distance method
Declaring all of the 'Enemy' variables
jfjfjf
Merge remote-tracking branch 'origin/CollisionImprovements' into ChrisFun
Fixed the way I created enemy, attempting to make enemy by position
instead of velocity
Merge remote-tracking branch 'origin/CollisionImprovements' into
ChrisFun
Merge remote-tracking branch 'origin/ChrisFun'

Conflicts:
	BrainSphere/src/Graphics/Display.java
	BrainSphere/src/brainteam/client/Client.java