Interacting fixes;
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	Assets/Objects/Gameplay/Player.prefab
Merge branch 'master' of https://github.com/ifdm/siphon
Very rough inclusion of dying animation;
Restored .metas;
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	.gitignore
	Assets/Graphics/Art/comet.meta
	Assets/Graphics/Art/comet/comet_600x526.png.meta
	Assets/Graphics/Art/level-one-environment/midground/RockCliff_1701x2061.png.meta
	Assets/Graphics/Art/level-one-environment/midground/RockOverhang_1974x2112.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone1.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone10.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone11.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone12.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone13.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone2.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone3.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone4.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone5.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone6.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone7.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone8.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Stone9.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Wall1_2229x2306.png.meta
	Assets/Graphics/Art/level-one-environment/midground/Wall2_2131x2229.png.meta
	Assets/Graphics/Art/tankbot.meta
	Assets/Graphics/Art/tankbot/tankbot.png.meta
	Assets/Graphics/GUI/cursor.png.meta
	Assets/Graphics/Placeholder/RoboHead_PlaceHolder-500x500.png.meta
	Assets/Graphics/Skeletons/Player/skeleton-1.png.meta
	Assets/Levels/Tests/testCursor.unity.meta
	Assets/Levels/Tests/testObjects.unity.meta
	Assets/Objects/Gameplay/Boilerplate.prefab
	Assets/Resources.meta
	Assets/Resources/GUI Animations/crosshair-loop.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00039.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00040.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00041.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00042.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00043.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00044.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00045.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00046.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00047.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00048.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00049.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00050.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00051.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00052.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00053.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00054.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00055.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00056.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00057.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00058.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00059.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00060.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00061.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00062.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00063.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00064.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00065.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00066.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00067.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00068.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00069.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00070.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00071.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00072.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00073.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00074.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00075.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00076.png.meta
	Assets/Resources/GUI Animations/crosshair-loop/crosshair-loop_00077.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00000.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00001.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00002.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00003.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00004.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00005.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00006.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00007.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00008.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00009.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00010.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00011.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00012.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00013.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00014.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00015.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00016.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00017.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00018.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00019.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00020.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00021.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00022.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00023.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00024.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00025.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00026.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00027.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00028.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00029.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00030.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00031.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00032.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00033.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00034.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00035.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00036.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00037.png.meta
	Assets/Resources/GUI Animations/crosshair-start/crosshair-start_00038.png.meta
	Assets/Scripts/objects/1.1.1.meta
	Assets/Scripts/objects/1.1.1/TreeFall.cs.meta
	Assets/Scripts/objects/1.1.2.meta
	Assets/Scripts/objects/1.1.2/RobotDie.cs.meta
	Assets/Scripts/objects/1.1.3/BranchBreak.cs.meta
	Assets/Scripts/objects/1.1.3/BranchStrain.cs.meta
	Assets/Scripts/objects/1.1.3/BridgeBreak.cs.meta
	Assets/Scripts/objects/cursor/CursorBehavior.cs.meta
	Assets/Scripts/objects/musicTrigger/AudioTrigger.cs.meta
	Assets/Scripts/objects/musicTrigger/EntityAudio.cs.meta