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