STEPPED ON A LADYBUG
LAAAAAAAAAADYBUUUUUUUUUUG
Merge branch 'master' of https://github.com/Sephonia/XNAPWN

Conflicts:
	WeakSven.sln
	WeakSven/WeakSven/Game1.cs
	WeakSven/WeakSven/Player.cs
	WeakSven/WeakSven/bin/x86/Debug/Content/Level1.txt
	WeakSven/WeakSven/bin/x86/Debug/WeakSven.exe
	WeakSven/WeakSven/bin/x86/Debug/WeakSven.pdb
	WeakSven/WeakSven/bin/x86/Debug/level1.txt
	WeakSven/WeakSven/obj/x86/Debug/ContentPipeline-{A3936EFA-AB81-4292-B172-4B675DF12269}.xml
	WeakSven/WeakSven/obj/x86/Debug/WeakSven.csproj.FileListAbsolute.txt
	WeakSven/WeakSven/obj/x86/Debug/WeakSven.csprojResolveAssemblyReference.cache
	WeakSven/WeakSven/obj/x86/Debug/WeakSven.exe
	WeakSven/WeakSven/obj/x86/Debug/WeakSven.pdb
	XNAGUI/Component.cs
	XNAGUI/Properties/AssemblyInfo.cs
	XNAGUI/XNAGUI.csproj