MainLevel Scene
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ye Old Life Sim - Unity Project/Assets/Sound Effects.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/238645__madamvicious__female-medieval-voices.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/91924__benboncan__till-with-bell.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Alchemy.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Alchemy/104167__spaztastic__glug.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Alchemy/39218__jobro__boiling.mp3.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Barracks.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Barracks/175957__freefire66__swordraw.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Barracks/218463__yap-audio-production__arrowhit02.mp3.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Blacksmith.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Blacksmith/103632__benboncan__large-anvil-steel-hammer-4.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Blacksmith/151217__owlstorm__cough-3.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Blacksmith/164545__martinimeniscus__human-blowing-ff685.aiff.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Castle.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Castle/175957__freefire66__swordraw.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Castle/249404__zagi2__fanfare-announcement-2.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Castle/grey_knights_colanian_war_cry_2.mp3.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Chapel.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Chapel/105197__cormi__monks-04.mp3.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Chapel/106544__club-sound__marble-church.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Chapel/164484__adam-n__geese.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Farm.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Farm/58277__benboncan__cow.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Market.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Market/104588__meral__celtic-meral(bard).wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Market/108453__swoboman87__scissors.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Market/154376__semccab__broom-sweep.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Market/derp_yell.mp3.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Stable.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Stable/217767__reitanna__ratty-squeaks.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Jobs/Tavern.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/Tavern/256508__kodack__riffle-card-shuffle.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/YeOldSexShop.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Jobs/YeOldSexShop/187562__eelke__3-scrapes.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Player.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Player/107624__stintx__running-02.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Player/151220__owlstorm__page-turn-1.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Transportation.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Transportation/18229__dobroide__20060419-horse-neigh.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Transportation/220028__andrescompovigo__gallop-fast.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound
Effects/Transportation/41180__dobroide__20070918-galloping-horse.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Using Items.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Using
Items/104167__spaztastic__glug.wav.meta
	Ye Old Life Sim - Unity Project/Assets/Sound Effects/Using
Items/132717__gmajorrr__burp.wav.meta
Merge branch 'master' of https://github.com/phbickle/Ye-Old-Life-Simulator