sync
fixed green ship
Merge branch 'master' of https://github.com/hughybarra/GroupProject