things
Merge branch 'master' of https://github.com/yramagicman/_s

* 'master' of https://github.com/yramagicman/_s:
  I guess I changed stuff
  things