_
Merge branch 'developer' into josh
Added active powerup display to the gui
added player directional facing, melee and aura attack hitboxes
Added chaser/sniper attack
Untracked binary files from being pushed
Fixed enemy prefabs
Merge branch 'developer' of https://github.com/jcollins2014/Project into hao

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/GameScene.unity
	Assets/Scripts/Game/Enemies.meta
	Assets/Scripts/Interface/GameGUI.cs
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/7f/7fba0c7ead37bf7428320506bfa837a2
	Library/metadata/98/98337e9f0fb10124686ea1d1d22a3673
	Library/metadata/ab/ab2190278d94df04ea9ccb33295fad0f
	Library/metadata/c0/c05cbf99ea7aaae4da3c3c1b32750cac
	Library/metadata/d2/d291dcd570b390546a1a5a73939aaf5e
	Project-csharp.sln
	Project.sln
	Project.userprefs