Merge branch 'master' of https://github.com/mmoy92/Grim

Conflicts:
	Assets/PlayerHealthBarScript.cs
Merge branch 'master' of https://github.com/mmoy92/Grim

Conflicts:
	Assets/PlayerHealthBarScript.cs