merge
Merge branch 'master' of https://github.com/jonasastrom/Grupp-1---Battleship
merger problem