waDA
Merge branch 'master' of https://github.com/jakubhrdy/NavalBattle

Conflicts:
	NavalBattle.v12.suo
	NavalBattle/bin/Debug/NavalBattle.exe
	NavalBattle/bin/Debug/NavalBattle.pdb
	NavalBattle/obj/Debug/App.g.cs
	NavalBattle/obj/Debug/App.g.i.cs
	NavalBattle/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	NavalBattle/obj/Debug/Game.g.cs
	NavalBattle/obj/Debug/Game.g.i.cs
	NavalBattle/obj/Debug/MainWindow.g.cs
	NavalBattle/obj/Debug/MainWindow.g.i.cs
	NavalBattle/obj/Debug/NavalBattle.csproj.FileListAbsolute.txt
	NavalBattle/obj/Debug/NavalBattle.csproj.GenerateResource.Cache
	NavalBattle/obj/Debug/NavalBattle.exe
	NavalBattle/obj/Debug/NavalBattle.pdb
	NavalBattle/obj/Debug/NavalBattle_MarkupCompile.cache
	NavalBattle/obj/Debug/NavalBattle_MarkupCompile.i.cache