Removed extraneous files.
Merge branch 'master' of https://github.com/brawn/pump_up_the_jam

# By MIchael LeGrand
# Via MIchael LeGrand
* 'master' of https://github.com/brawn/pump_up_the_jam:
  Fixing compile errors as I type this up.
  Trying to add a git ignore. renaming the scene and the project

Conflicts:
	.gitignore
	unity_project/Assets/BrainJam/GameObjects/element_blue_diamond.prefab
	unity_project/Assets/BrainJam/GameObjects/element_blue_diamond.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_blue_square.prefab
	unity_project/Assets/BrainJam/GameObjects/element_blue_square.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_green_diamond.prefab
	unity_project/Assets/BrainJam/GameObjects/element_green_diamond.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_grey_diamond.prefab
	unity_project/Assets/BrainJam/GameObjects/element_grey_diamond.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_grey_square.prefab
	unity_project/Assets/BrainJam/GameObjects/element_grey_square.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_purple_diamond.prefab
	unity_project/Assets/BrainJam/GameObjects/element_purple_diamond.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_purple_square.prefab
	unity_project/Assets/BrainJam/GameObjects/element_purple_square.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_red_diamond.prefab
	unity_project/Assets/BrainJam/GameObjects/element_red_diamond.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_red_square.prefab
	unity_project/Assets/BrainJam/GameObjects/element_red_square.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_yellow_diamond.prefab
	unity_project/Assets/BrainJam/GameObjects/element_yellow_diamond.prefab.meta
	unity_project/Assets/BrainJam/GameObjects/element_yellow_square.prefab
	unity_project/Assets/BrainJam/GameObjects/element_yellow_square.prefab.meta
	unity_project/Library/metadata/2c/2ce96f6a309dd0443955acf435ab7fb6
	unity_project/Library/metadata/5f/5f42a843a13ec3e48817c861296a09c8
	unity_project/Library/metadata/71/71e00ea1774bdd840ba97cd78ddcb35d
	unity_project/Library/metadata/82/827f585e8526dc34b9672086719ed792
	unity_project/Library/metadata/8a/8a23114fc8faa3f48bba7622a97165dc
	unity_project/Library/metadata/b1/b13474c6c30ac9d41aeb969399397492
	unity_project/Library/metadata/b8/b84c38e27f9fd6a44a7a54aa2fff8dd1
	unity_project/Library/metadata/b9/b9f1bb75dd162084b9f8614f4c98ffa5
	unity_project/Library/metadata/bf/bf557d2e6df54874b8e6548eb91c51c9
	unity_project/Library/metadata/e8/e80431a9b9c31884582d392472c54a25
	unity_project/Library/metadata/f3/f3e6184b7436eca4eb7b8729ed29f3a6