add
Merge remote-tracking branch 'origin/master'

Conflicts:
	ALTRun/ALTRun.ini
	ALTRun/FavoriteList.txt
	ALTRun/ShortCutList.txt
	ALTRun/ShortCutList.txt.bak
	emacs/setting/.emacs.d/.smex-items
	emacs/setting/.emacs.d/recentf
	emacs/setting/.emacs.d/saved-places