Started fixing collisions
Merge branch 'master' of https://github.com/Df458/DFEngine
More collision work