Code that needs to be fixed

I am trying to check there is no overlap when spawning random types.
Merge remote-tracking branch 'origin/master'

Conflicts:
	HiVolts/src/v1/GameFrame.java