Spaceship added to scene 1
Merge branch 'art'
Spaceship and Rocket added, art branch merged with master branch