I Don't Get What Its Asking Me To Do
Merge branch 'master' of https://github.com/david-ahern/NoEndHouse

Conflicts:
	Assets/Materials/Blur.mat
	Assets/Plugins/GDG_Assets/!Instructions/Materials/Cube_Inside.mat
	Assets/Plugins/GDG_Assets/!Instructions/Materials/Cube_Outside.mat
	Assets/Plugins/GDG_Assets/BreakTrigger/BreakTrigger.mat
	Assets/Plugins/GDG_Assets/BreakTrigger/BreakTrigger.prefab
	Assets/Plugins/GDG_Assets/Breakable Barrel/Materials/Barrel_Bands.mat
	Assets/Plugins/GDG_Assets/Breakable Barrel/Materials/Barrel_Inside.mat
	Assets/Plugins/GDG_Assets/Breakable Barrel/Materials/Barrel_Outside.mat
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/Barrel_Controller.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master0.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master1.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master10.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master11.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master12.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master13.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master14.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master15.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master16.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master17.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master18.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master19.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master2.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master3.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master4.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master5.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master6.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master7.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master8.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL1_Master9.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master0.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master1.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master10.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master11.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master12.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master13.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master14.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master15.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master16.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master17.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master18.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master19.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master2.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master3.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master4.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master5.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master6.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master7.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master8.prefab
	Assets/Plugins/GDG_Assets/Breakable
Barrel/Prefabs/LowerLevels_Don'tTouch/Barrel_DL2_Master9.prefab
	Assets/Plugins/GDG_Assets/Breakable Cube01/Materials/Cube01_Inside.mat
	Assets/Plugins/GDG_Assets/Breakable Cube01/Materials/Cube01_Outside.mat
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/Cube01_Controller.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master0.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master1.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master2.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master3.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master4.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master5.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master6.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master7.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master8.prefab
	Assets/Plugins/GDG_Assets/Breakable
Cube01/Prefabs/LowerLevels_Don'tTouch/Cube01_DL1_Master9.prefab
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Camo_Fracture.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Camo_Ouside.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Fracture.mat
	Assets/Plugins/GDG_Assets/Breakable
Egg/Materials/Egg_Noisy_Fracture.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Noisy_Ouside.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Ouside.mat
	Assets/Plugins/GDG_Assets/Breakable
Egg/Materials/Egg_Smooth_Fracture.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Smooth_Ouside.mat
	Assets/Plugins/GDG_Assets/Breakable
Egg/Materials/Egg_Type2_Fracture.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Type2_Ouside.mat
	Assets/Plugins/GDG_Assets/Breakable
Egg/Materials/Egg_Type3_Fracture.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Type3_Ouside.mat
	Assets/Plugins/GDG_Assets/Breakable
Egg/Materials/Egg_Type4_Fracture.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Materials/Egg_Type4_Ouside.mat
	Assets/Plugins/GDG_Assets/Breakable Egg/Prefabs/Egg_Controller.prefab
	Assets/Plugins/GDG_Assets/Breakable
Egg/Prefabs/LowerLevels_Don'tTouch/Egg_DL1_Master0.prefab
	Assets/Plugins/GDG_Assets/Breakable
Egg/Prefabs/LowerLevels_Don'tTouch/Egg_DL1_Master1.prefab
	Assets/Plugins/GDG_Assets/Breakable
Egg/Prefabs/LowerLevels_Don'tTouch/Egg_DL2_Master0.prefab
	Assets/Plugins/GDG_Assets/Breakable
Egg/Prefabs/LowerLevels_Don'tTouch/Egg_DL2_Master1.prefab
	Assets/Plugins/GDG_Assets/Cargo/Cargo Time.prefab
	Assets/Plugins/GDG_Assets/Cargo/Cargo.prefab
	Assets/Plugins/GDG_Assets/Cargo/Cargo_ExplosiveShot.mat
	Assets/Plugins/GDG_Assets/Cargo/Cargo_ExplosiveShot.prefab
	Assets/Plugins/GDG_Assets/Cargo/Cargo_Time.mat
	Assets/Plugins/GDG_Assets/Cargo/Null.prefab
	Assets/Plugins/GDG_Assets/Cargo/Sphere.prefab
	Assets/Plugins/GDG_Assets/Floor/Floor.mat
	Assets/Plugins/GDG_Assets/Particles/Dust.prefab
	Assets/Plugins/GDG_Assets/Particles/Sources/Materials/Dust Material
1.mat
	Assets/Plugins/GDG_Assets/Projectiles/Projectile.mat
	Assets/Plugins/GDG_Assets/Projectiles/Projectile.prefab
	Assets/Plugins/GDG_Assets/Projectiles/Projectile_Explosive.mat
	Assets/Plugins/GDG_Assets/Projectiles/Projectile_Explosive.prefab
	Assets/Plugins/GDG_Assets/Resources/ExplosionSphere.prefab
	Assets/Plugins/GDG_Assets/Scenes/DemoScene.unity
	Assets/Plugins/GDG_Assets/Scenes/Instructions.unity
	Assets/Plugins/GDG_Assets/Sky/Sky.mat