update merge
update merge
Merge branch 'develop' of github.com:noitorai/dotemacses into develop

Conflicts:
	.emacs.d/init.el
Typo
Avoid warning