Fixfix.
Merge branch 'master' of https://github.com/EricNordlund/PirateWars

Conflicts:
	WindowsFormsApplication3/Controller/Controller.cs
	WindowsFormsApplication3/Form1.Designer.cs
	WindowsFormsApplication3/Form1.cs
	WindowsFormsApplication3/Game.cs
	WindowsFormsApplication3/Model/DataAccessLayer.cs