Final Update
Final Update 2.0
omg final
Merge branch 'master' into mattDev

Conflicts:
	Assets/Scripts/CharacterMovement.cs
Merge branch 'master' of https://github.com/matt-short/Platformer-Repo