huge update for everything
Merge branch 'master' of github.com:StellaCannefax/you-sps