kirisame(Ubuntu12.04)
rm bashrc zshrc
emacs.el にmozcの呼び出しを追加
mozc.el追加、load pathの位置を変更
ibus-mozc追加
emacs 以下を追加
emacs, qmarks, zshrc fixed
Merge branch 'kirisame' of github.com:Ataro24/mylib into kirisame

Conflicts:
	emacs/emacs.el
add ibus.el and zlc.el
add git info on prompt and remove any matlab path
add new prompt:flandre,patchouli
add screen, tmux.conf, vimrc
modified ls and compinit
rm Makefile. add install.sh
modified color scheme
mv emacs-lisps to vender
add mkdir .emacsbackup
fixed zshrc, bashrc
Merge pull request #2 from Ataro24/flandre

Flandre