Combat system outline complete. Can continue adding interaction between objects (including spells!) via the combat update.
Added combat structure that is easily updatable for SPELLLS!!!!!!!EUUUUHUHUHAUAHH
Merging Branch
Merge remote-tracking branch 'origin/master'

Conflicts:
	WeakSven/WeakSven/Game1.cs
	WeakSven/WeakSven/WeakSven.csproj
	WeakSven/WeakSven/WeakSven.csproj.Debug.cachefile
	WeakSven/WeakSven/bin/x86/Debug/WeakSven.exe
	WeakSven/WeakSven/bin/x86/Debug/WeakSven.pdb
	WeakSven/WeakSven/obj/x86/Debug/ContentPipeline-{A3936EFA-AB81-4292-B172-4B675DF12269}.xml
	WeakSven/WeakSven/obj/x86/Debug/WeakSven.exe
	WeakSven/WeakSven/obj/x86/Debug/WeakSven.pdb
	WeakSven/WeakSven/obj/x86/Debug/cachefile-{A3936EFA-AB81-4292-B172-4B675DF12269}-targetpath.txt
	WeakSven/WeakSvenContent/WeakSvenContent.contentproj