.
Merge branch 'master' of https://github.com/matt-short/Platformer-Repo

Conflicts:
	Assets/Prefabs and Models/Spider Green/Prefab/Small Spider.prefab
	Assets/Scripts/CharacterMovement.cs
	Assets/Scripts/Health.cs
	Assets/level.unity