refactoring
Merge branch 'master' of https://github.com/hamchapman/Battleships

Conflicts:
	lib/board.rb
Final fixes and config