modified:   ac-comphist.dat
	deleted:    init.el~
Merge branch 'master' of github.com:ivan7702/emacs_setup

Conflicts:
	ac-comphist.dat
	modified:   init.el