adding changes to solarsystem.js file including new method in the planet object
trying to sync the db.yml file
fixed conflict in db.yml