Adjusted Random Spawn Code Slightly
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/camera.cpp
Blah