Added member for ship type
Merge branch 'master' of https://github.com/awsmith/ship_game