more sounds almost done
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/ArtAssets/Item-Icons.meta
	Assets/ArtAssets/Item-Icons/Armour-Item.png.meta
	Assets/ArtAssets/Item-Icons/Axe-Item.png.meta
	Assets/ArtAssets/Item-Icons/Crossbow-Item.png.meta
	Assets/ArtAssets/Item-Icons/Dagger-Item.png.meta
	Assets/ArtAssets/Item-Icons/Item-Icons.xcf.meta
	Assets/ArtAssets/Item-Icons/Ring-Item.png.meta
	Assets/ArtAssets/Item-Icons/Spear-Item.png.meta
	Assets/ArtAssets/Item-Icons/Staff-Item.png.meta
	Assets/ArtAssets/Item-Icons/Sword-Item.png.meta
	Assets/Scripts/Player.cs
	UnityVS.LudumDare31.v12.suo