Worked on controller
Merge branch 'master' of github.com:jorunfa/battleship