bb

bkla
Hej
Platform klass

Klassen är gjord
Merge branch 'master' of https://github.com/WiJeBe/Arkardmaskin

Conflicts:
	.gitignore
	ProjectJumpyTHing/ProjectJumpyThing/GameObject.cs
	ProjectJumpyTHing/ProjectJumpyThing/Platform.cs
	ProjectJumpyTHing/ProjectJumpyThing/Player.cs
	ProjectJumpyTHing/ProjectJumpyThing/bin/x86/Debug/ProjectJumpyThing.exe
	ProjectJumpyTHing/ProjectJumpyThing/bin/x86/Debug/ProjectJumpyThing.pdb
	ProjectJumpyTHing/ProjectJumpyThing/obj/x86/Debug/ContentPipeline-{B3E192CD-A59F-4C38-BE55-0E8B84194C59}.xml
	ProjectJumpyTHing/ProjectJumpyThing/obj/x86/Debug/ProjectJumpyThing.csproj.FileListAbsolute.txt
	ProjectJumpyTHing/ProjectJumpyThing/obj/x86/Debug/ProjectJumpyThing.exe
	ProjectJumpyTHing/ProjectJumpyThing/obj/x86/Debug/ProjectJumpyThing.pdb
Merge branch 'master' of https://github.com/WiJeBe/Arkardmaskin.git