Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
fixed camera bug, made planets into balls
really fixed camera bug
Merge branch 'gh-pages'