fixed merge issues
Merge branch 'master' into laptop
Merge branch 'laptop' of github.com:kdmurray91/configs into laptop