Jeff's changes, compile errors fixed, linker errors exist
Merge branch 'master' of https://github.com/GavinHigham/SHMUP-Test