Format code
Merge branch 'master' of github.com:evan-liu/Spaceship