NO ERRORS
Merge branch 'New-branch' of https://github.com/Tewlip/Dat-sidescroller into New-branch

Conflicts:
	Assets/Scripts/Player.cs