Merge branch 'master' of /home/ryo/Dropbox/git/dotfiles
DEADLINE検索の追加
zaw-psの追加
emacs calcのaliasの追加!
merged dropbox