add some stuff, modify some stuff
Merge branch 'master' of github.com:/clinstid/dotfiles