add some files, configurations.
Merge branch 'master' of github.com:ofnhwx/.emacs.d

Conflicts:
	init-custom.el