RoBro will damage at 50% and death animation
Merge branch 'master' of 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-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/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.csprojResolveAssemblyReference.cache
	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
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/WindowsGame4Content.contentprojResolveAssemblyReference.cache
ReCommit to pull alexas stuff
Merge branch 'master' of github.com:Terhands/LazerSharktopus

Conflicts:
	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/ContentPipeline.xml
	ProjectSource/Tile&JumpProto/WindowsGame4/WindowsGame4Content/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Take2 of recommit
RoBro takes damage at 50% and now has death animation