robro can no longer jump through magnets & spikes and doesn't take damage when he hits his head on the bottom of a spike
+ updating level1
Merge branch 'master' of github.com:Terhands/LazerSharktopus

Conflicts:
	ProjectSource/Tile&JumpProto/WindowsGame4.suo
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/Player.cs
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/bin/x86/Debug/Content/Level1.txt
	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/WindowsGame4.exe
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/obj/x86/Debug/WindowsGame4.pdb
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/Level1.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/lathraia.config
+ fixed the level->gate relationship (was adding the wrong gate to the lever's gate list)
Merge branch 'master' of github.com:Terhands/LazerSharktopus

Conflicts:
	ProjectSource/Tile&JumpProto/WindowsGame4.suo
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4/Level.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-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/WindowsGame4Content/Level1.txt
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+ merge + fix for gate-lever pulling