stash commit
stash commit
stash commit
Merge branch 'master' of https://github.com/jagajaga/my_configs

Conflicts:
	.emacs.d/ac-comphist.dat
pull fix