Added hack to the resolution of collisions. This is temporary
Merge branch 'master' of https://github.com/jpleitao/projecto-cg