fix the URL of the nightsky image
housecleaning and added collisions
Merge branch 'master' into gh-pages