Fixed a bug on Megaflare that made the boss hang.
Merge branch 'master' of https://github.com/Phoniks7/EGDGoodGrief

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/_Art/Character/Archer/Animations/blue.meta
	Assets/_Art/Character/Archer/Animations/green.meta
	Assets/_Art/Character/Archer/Animations/red.meta
	Assets/_Art/Character/Archer/Animations/yellow.meta
	Assets/_Art/Character/Ninja/Animations/blue.meta
	Assets/_Art/Character/Ninja/Animations/green.meta
	Assets/_Art/Character/Ninja/Animations/red.meta
	Assets/_Art/Character/Ninja/Animations/yellow.meta
	Assets/_Art/GUI/Common/Items.meta
	Assets/_Scripts/SpiderBoss/BehaviorTreesAssets/UnityMegaFlare.asset
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper