modified ship image
Merge branch 'master' of https://github.com/Cyboot/netproto into network
Merge branch 'temp' into network