Moved game controller logic to tournament model
End tournament/game logic
Updated Todo list
Added annotate gem
Made empty grid method public
Tidied whitespace
Completed pending specs for tournament team scopes
Added ship hit and destroyed
Added game end after 100 moves
Added game end after fleet sunk
Added specs to check correct maps are created by tournament
Added no tournament error to api docs
Merged master, fixed conflicts of my own stupid making
Merge branch 'master' into tournament
Merged master and fixed conflicts, grrrr annotate
Merged master and fixed conflicts, grrrr annotate
Merge pull request #30 from mitadmin/tournament

Tournament