Merge branch 'master' of github.com:catls/dotfiles into firefox
add .gitignore
Merge branch 'firefox'
update zshrc.alias
グリモンを整理
グリモンを整理
config.xmlの追跡をやめる
Merge branch 'pixiv_dsbder'

Conflicts:
	.mozilla/firefox/sample/gm_scripts/config.xml
	.mozilla/firefox/sample/gm_scripts/pixiv_dsbder/pixiv_dsbder.user.js