lukevers/Starscape — pull request #1 by lukevers (2012-07-09 22:38:22+00:00)
Title: Pulling gh-pages branch to master branch

Work was done on the gh-pages branch instead of master, and now I am pulling to master from gh-pages to keep both branches up to date.