start of collisionController
Merge branch 'master' of https://github.com/grifdail/GW2014-rebond
remove a bug