More updates
merge
Merge branch 'master' of https://github.com/ryanhyma/HymaGameEngine.git
More collision detection stuff. Think all cases are accounted for.