Revert "Revert "this is a noob commmit. It should be rolled back.""

This reverts commit f6dd1770013a673e4c641bfbb3324205d1b54087.
Implemented collision detection