Merge branch 'Main_Branch' into New-branch
CubbartController changes
Merge branch 'New-branch' of https://github.com/Tewlip/Dat-sidescroller into New-branch
Merge branch 'Main_Branch' of https://github.com/Tewlip/Dat-sidescroller into New-branch
Fixed stuff with jump mechanic.
New ignore files
Merge branch 'New-branch' of https://github.com/Tewlip/Dat-sidescroller into New-branch
Jump updated, rigidbody added...n' stuff
Merge branch 'New-branch' of https://github.com/Tewlip/Dat-sidescroller into Main_Branch

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
Fixed platform and stuff again.
Minor fixes with the variables
Merge branch 'New-branch' of https://github.com/Tewlip/Dat-sidescroller into Main_Branch

Conflicts:
	Assets/Cubbart.unity
	Assets/Scripts/Player.cs
Player laser
Merge branch 'New-branch' of https://github.com/Tewlip/Dat-sidescroller into New-branch

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Cubbart.unity
	Assets/Scripts/Player.cs
Got a score text now, and fixed the free jump in the beginning