Added and changed stuff
Merge branch 'master' of https://github.com/jangerritharms/home
First deleted st, then readded it