re-styled code
merge branch 'master' of https://github.com/NickTitle/starfield