Merge branch 'master' of github.com:amedeedaboville/battleships into john
Merge branch 'master' of github.com:amedeedaboville/battleships into john
Merge branch 'master' of github.com:amedeedaboville/battleships into john
Fixed cannon range bug. Now a message is only displayed when a ship is hit
sorry, now it's fixed.
opponent now has a kamikaze boat
super armor bows now properly display damage
fixed merge stuff