save changes.
Merge branch 'master' of github.com:quancta/emacs.d
mostly disable smooth scrolling
resolve merge conflict