Collision detection phase 1
Collision avoidance done
Merge branch 'master' of github.com:Cobra-Kao/synckr

* 'master' of github.com:Cobra-Kao/synckr:
  overlay