Merge remote-tracking branch 'origin/master' into Lars-Branch
Fixat statistikpanelen
Merge remote-tracking branch 'origin/Lars-Branch'

Conflicts:
	BattleShips/src/Main.java
	BattleShips/src/game/Player.java
Refined the buttons x 2
Merge branch 'Villiams-branch'

Conflicts:
	BattleShips/src/game/Game.java
	BattleShips/src/main/GamePanel.java
Fixed merge problem