Fix up
fixed all player attacks after enemy collision fix introduced some player attack inconsistencies
Merge branch 'developer' of https://github.com/jcollins2014/Project into hao
Added Healer
Added Healer
added skeletons to enemies
merging
fixed conflicts
Added textures/models/animations/etc
quick fix
Added Charger
Merge branch 'developer' of https://github.com/jcollins2014/Project into developer

Conflicts:
	Assets/Scenes/GameScene.unity
Patched Merge Bugs

EnemyChargerScript declared variables that were already declared in its
parent
Fixed Particle Effects on EnemyHealer
bug fixes
more fixes
Merge branch 'developer' of https://github.com/jcollins2014/Project into developer
Added charger with animations
more bugfixes and player ground aura
trying to change color of spawned units