Supercommit och lite uppdaterad design.
Merge branch 'master' of https://github.com/EricNordlund/PirateWars

Conflicts:
	WindowsFormsApplication3/bin/Debug/WindowsFormsApplication3.exe
	WindowsFormsApplication3/bin/Debug/WindowsFormsApplication3.pdb
	WindowsFormsApplication3/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	WindowsFormsApplication3/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WindowsFormsApplication3/obj/x86/Debug/PirateWars.csproj.FileListAbsolute.txt
	WindowsFormsApplication3/obj/x86/Debug/PirateWars.csproj.GenerateResource.Cache
	WindowsFormsApplication3/obj/x86/Debug/WindowsFormsApplication3.exe
	WindowsFormsApplication3/obj/x86/Debug/WindowsFormsApplication3.pdb