#Some more info ....
Merge branch 'master' of https://github.com/floppycode/home-config

Conflicts:
	.emacs.d/emacs_config.org
	.gitignore
#Some more info ....