Fixed inconsistancies
Merge branch 'master' of https://github.com/TheMagicalSteve/TeamFourGame