Add .metadata directory to .gitignore
Add simple collision detection in a separate activity, to be integrated later
Merging Prakhar's UI changes
Testing adding the sample slide layout.
Temp UI Changes{
Merge branch 'prakhar'
Merge branch 'jake'
Merging changes from Master