wip
wip
Merge branch 'master' of github.com:ymln/dotfiles

Conflicts:
	.emacs
wip