Working on movement and collision
Merge branch 'develop' of github.com:Celestibytes/CTIEngine into develop