Less NPE, less empty names
Merge branch 'master' of https://github.com/jonasastrom/Grupp-1---Battleship