Back in time with some balance changes and wtf is with this noise
Merge branch 'master' of https://github.com/gentlecolts/trippy-procedurally-generated-star-fox-clone-for-school

Conflicts:
	GameController.cpp

HelloSDL.xcodeproj/project.xcworkspace/xcuserdata/jonahchazan.xcuserdata
d/UserInterfaceState.xcuserstate
	HelloSDL/BasicGun.cpp
	HelloSDL/BossWave.cpp
	HelloSDL/Matrix.cpp
	HelloSDL/ObjectFactory.cpp
	HelloSDL/RegisterEnemies.cpp
	HelloSDL/SwarmWave.cpp
	PlayerShip.cpp
	camera.cpp
	constants.h
	gameObject.cpp
	testEnemyWave1.cpp