fixed some things that broke in my last merge
Merge branch 'master' of https://github.com/Terhands/LazerSharktopus

Conflicts:
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/GameLoop.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/WindowsGame4.csproj.Debug.cachefile
	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/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/WindowsGame4/obj/x86/Debug/cachefile-{CA0DE09B-9CB2-4716-A9AF-EF0E3769966A}-targetpath.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/WindowsGame4Content.contentproj
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/ContentPipeline.xml
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
added box and button instructions to guard distraction tutorial
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/WindowsGame4.csproj.Debug.cachefile
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/Tutorial4.txt
	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/WindowsGame4/obj/x86/Debug/cachefile-{CA0DE09B-9CB2-4716-A9AF-EF0E3769966A}-targetpath.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/WindowsGame4Content.contentproj
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
fixed some whacked up shit that happened to the level files, might only have effected me.
fdjgfdlkjdfgdjfg
Merge branch 'master' of https://github.com/Terhands/LazerSharktopus

Conflicts:
	ProjectSource/Tile&JumpProto/WindowsGame4.suo
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/IMap.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/ITile.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/Level.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/Map.cs
	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-BlueMist.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-MechaNoir.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/DST-StarryBook.wma
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/Level1.txt
	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/WindowsGame4/obj/x86/Debug/cachefile-{CA0DE09B-9CB2-4716-A9AF-EF0E3769966A}-targetpath.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/Level1.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/WindowsGame4Content.contentproj
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/ContentPipeline.xml
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache