Re-adding in my deleted changes.
Merge branch 'master' of https://github.com/10DaysLeftToLive/TimeWhaleEngine