some stuff
Merge branch 'master' of github.com:nikki93/.emacs.d