+ stop standing on hideable blocks fix
Merge branch 'master' of https://github.com/Terhands/LazerSharktopus

Conflicts:
	ProjectSource/Tile&JumpProto/WindowsGame4.suo
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/GameLoop.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-AngryRobotIII.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Aronara.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Beneathere.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Birge.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-BlueMist.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-ConFuze.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-MechaNoir.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Muses.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Pariah.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-StarryBook.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/WindowsGame4.exe
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/WindowsGame4.pdb
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/WindowsGame4.csproj.FileListAbsolute.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/WindowsGame4.exe
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/WindowsGame4.pdb
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
*reordered tutorials

-removed tutorial 2 (basic jump)
*fixed layout issues in tutorial 1 and 3
*renamed tut 3
*messed around with guard tutorial background (unfinished
+added hazards tutorial (unfinished)
Merge branch 'master' of https://github.com/Terhands/LazerSharktopus

Conflicts:
	ProjectSource/Tile&JumpProto/WindowsGame4.suo
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/WindowsGame4.csproj.Debug.cachefile
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-AngryRobotIII.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Aronara.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Beneathere.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Birge.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-BlueMist.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-ConFuze.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-MechaNoir.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Muses.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-Pariah.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-StarryBook.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/WindowsGame4.exe
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/WindowsGame4.pdb
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/WindowsGame4.csproj.FileListAbsolute.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/WindowsGame4.exe
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/WindowsGame4.pdb
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/ContentPipeline.xml
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/WindowsGame4Content.contentproj.FileListAbsolute.txt