Integrate collision detection to MainActivity
Merge branch 'jake'