pulled changes
Merge branch 'master' of github.com:CrowdHailer/Battle-ships