Your code is now static
Merge branch 'master' of https://github.com/jonasastrom/Grupp-1---Battleship

Conflicts:
	Battleship/src/Game/GameEngine.java
Merge branch 'master' of https://github.com/jonasastrom/Grupp-1---Battleship
Merge branch 'master' of https://github.com/jonasastrom/Grupp-1---Battleship