use company-mode instead of auto-complete-mode
Merge branch 'master' of github.com:gabrielgrosnyj/.emacs.d

Conflicts:
	init.el