Additions to collision detection and resolution
Merge branch 'master' of https://github.com/liamcoau/jkEngine