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
Updated player prefab, added "resting" to charger
Merge branch 'developer' of https://github.com/jcollins2014/Project into developer

Conflicts:
	Assets/Prefabs/Player/Player.prefab
	Assets/Scenes/GameScene.unity
Charger changes, changes to collider, + more

- Fixed up Charger, shouldn't be bouncing around all over the place
anymore. Also added trail effect when charging
- Changed colliders and rigidbodies on prefabs in the way that Unity
meant for them to be used (changes made on player, traps, and powerups)
- Player now has collision with enemy (Player hitbox will collide)
Changed player prefab