Fixed the View and began to work on the Model
Merge branch 'master' of https://github.com/ljnissen/Battleship