Windows specific init.el
Merge branch 'windowsSpecific'

Conflicts:
	init.el