nn
Merge branch 'master' of http://github.com/floppycode/home-config

Conflicts:
	.emacs