Merge pull request #6 from amedeedaboville/charlieSetup

reorganize ships functionality
Merge pull request #7 from amedeedaboville/charlieSetup

wow I made a ver unelegant fix to the code. time to go home. shuffling s...
Merge pull request #8 from amedeedaboville/mines

Mines
fixed bug in loading that created a new game instead of loading you a game
fixed map and ship
Merge branch 'master' into mines
Merge branch 'fixMapAndShip' into mines
modified fireTorpedo, implemented basic explodeMine functionality