I fixed EVERYTHING
Merge branch 'master' of github.com:GavinHigham/SHMUP-Test

Conflicts:
	definitions.h
	logic_tick.c
	main.c
	struct_pool.c