messed with the farmhouse scene a bit
Merge branch 'master' of git@github.com:ChevyRay/TruffleHunters.git

Conflicts:
	Assets/Graphics/Characters/PlayerBackIdleHold0000.png.meta
	Assets/Graphics/Characters/PlayerBackIdleHold0001.png.meta
	Assets/Graphics/Characters/PlayerBackIdleHold0002.png.meta
	Assets/Graphics/Characters/PlayerBackIdleHold0003.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0000.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0001.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0002.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0003.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0004.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0005.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0006.png.meta
	Assets/Graphics/Characters/PlayerBackWalkHold0007.png.meta
	Assets/Graphics/Characters/PlayerFrontIdleHoldBlink0000.png.meta
	Assets/Graphics/Characters/PlayerFrontIdleHoldBlink0001.png.meta
	Assets/Graphics/Characters/PlayerFrontIdleHoldBlink0002.png.meta
	Assets/Graphics/Characters/PlayerFrontIdleHoldBlink0003.png.meta
	Assets/Graphics/Characters/PlayerFrontWalkHold0004.png.meta
	Assets/Graphics/Characters/PlayerFrontWalkHold0005.png.meta
	Assets/Graphics/Characters/PlayerFrontWalkHold0006.png.meta
	Assets/Graphics/Characters/PlayerFrontWalkHold0007.png.meta
	Assets/Graphics/Characters/PlayerFrontWalkHold0008.png.meta
	Assets/Graphics/Characters/PlayerFrontWalkHold0009.png.meta
	Assets/Graphics/Particles.meta
	Assets/Graphics/Particles/Ground.png.meta
	Assets/Graphics/Particles/Smoke.png.meta
	Assets/Graphics/Particles/Sweat.png.meta
	Assets/Scenes/FarmHouse.unity