asd
Merge remote-tracking branch 'origin/BackmansLillaMain' into Test

Conflicts:
	BattleShips/Battleships.db
	BattleShips/src/menu/SetUpPanel.java

Went back one step on game-panel.