Commit in order to get Collider.h/cpp
Merge