Add simple collision detection in a separate activity, to be integrated later
Merging Prakhar's UI changes
Merge branch 'jake'