I'm bad at GIT
Merge branch 'master' of https://github.com/mmoy92/Grim

Conflicts:
	Assets/Scripts/Charger_AI.js
	Assets/Scripts/KeyPickup.cs
	Assets/Scripts/PlatformerController.cs
	Assets/Scripts/grimInfo.cs