Merge branch 'master' of https://github.com/michaelanthonymain/tosche-station-web

updating local master
Added cool info about how small we are
fixed merge conflict
Merge pull request #48 from michaelanthonymain/adding-solar-system-width

Adding solar system width