"made the participant, computer, and player classes all one thing. also added fire to the player and computer classes."
"this board is wrong -TM"
Merge branch 'master' of https://github.com/theironyard-rails-atl/battleship

Conflicts:
	lib/Board.rb