collision side detection
Merge branch 'master' of https://github.com/nburo/TESTLOL_project