commit before pull
merging with changes from additions made when working on lab machine

Merge branch 'master' of https://github.com/HoldenCaulfieldRye/linux
adding emacs config