Minor change
Merge branch 'master' of github.com:iqbalansari/dotEmacs

Conflicts:
	my-init.org