Merge branch 'master' of X:\Users\Matt Seipel\AndroidStudioProjects\android_final_project_spring2014 with conflicts.
Collision detection