test to demo pull requests
Merge pull request #1 from jwhyte88/Developer

test to demo pull requests
removing test comments
refactor - damage
Further Ship edits
Merge pull request #2 from jwhyte88/Developer

Developer
moving over to Sam
all the different cell states
Merge pull request #1 from tansaku/Developer

all the different cell states