bla
cc
Merge branch 'master' of https://github.com/floppycode/home-config

Conflicts:
	.emacs
	.gitignore
	.pentadactylrc