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

Conflicts:
	NavalBattle.v12.suo
	NavalBattle/obj/Debug/NavalBattle_MarkupCompile.i.cache