added guard patrol boundaries
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/Guard.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/Level.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/Player.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/WindowsGame4.csproj
	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/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/ContentPipeline.xml
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/WindowsGame4Content.contentproj.FileListAbsolute.txt
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/Level.cs
	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/WindowsGame4Content/obj/x86/Debug/ContentPipeline.xml
got guard's image working again with the new changes
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/Level.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/Player.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/WindowsGame4.csproj
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/WindowsGame4.csproj.Debug.cachefile
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/lathraia.config
	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/lathraia.config
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/WindowsGame4Content.contentproj.FileListAbsolute.txt
torches have the correct texture again