For Mac, backup by copying is better
setup Doxymacs
ignore ac-comphist.dat
Merge branch 'master' of github.com:pedz/my.emacs.d

Conflicts:
	.gitignore
	pedz/pedz.el