Commiting so I can pull
Merge branch 'Vinny' of https://github.com/brainteam/BrainSphere.git
into Vinny

Conflicts:
	BrainSphere/src/Graphics/Display.java
Skeleton for collision
Merge branch 'Vinny' of https://github.com/brainteam/BrainSphere.git
into Vinny

Conflicts:
	BrainSphere/src/Graphics/Display.java
Merge branch 'Vinny' of https://github.com/brainteam/BrainSphere.git into Vinny