this is so hacked together im sorry
Merge branch 'master' of https://github.com/StartupShell/shell-site