modified:   emacs
	modified:   initiate-setting.el
	new file:   auxiliary-setting.el
Merge branch 'master' of https://github.com/nydw/emacs.d
	modified:   dynamic-setting.el