Check init.el
can work on cygwin
Merge branch 'bugfix-overriding-files' into dev

Conflicts:
	.emacs.d/init.el