Stopping a little crash and die
Merge branch 'master' of https://github.com/dasteve101/elec5614.git