blah
Merge branch 'master' of git@github.com:ChevyRay/TruffleHunters.git

Conflicts:
	Assets/Graphics/Characters/PlayerSideIdleHold0000.png.meta
	Assets/Graphics/Characters/PlayerSideIdleHold0001.png.meta
	Assets/Graphics/Characters/PlayerSideIdleHold0002.png.meta
	Assets/Graphics/Characters/PlayerSideIdleHold0003.png.meta
	Assets/Graphics/Characters/PlayerSideIdleHoldBlink0000.png.meta
	Assets/Graphics/Characters/PlayerSideIdleHoldBlink0001.png.meta
	Assets/Graphics/Characters/PlayerSideIdleHoldBlink0002.png.meta
	Assets/Graphics/Characters/PlayerSideIdleHoldBlink0004.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0000.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0001.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0002.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0003.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0004.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0005.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0006.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0007.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0008.png.meta
	Assets/Graphics/Characters/PlayerSideWalkHold0009.png.meta