.
Merge branch 'master' of github.com:mota/config

Conflicts:
	dot.emacs