yay
Merge branch 'master' of https://github.com/Ledge/Engine
Started implementing the new timing