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
t push origin masterMerge branch 'adding-solar-system-width'

fixed merge conflict
Merge branch 'master' into styling