add phpcolordiff
Merge branch 'master' of https://github.com/hanhan1978/junks
Merge branch 'master' of git://github.com/hanhan1978/junks
added tmux pane resize shortcut setting
Merge branch 'master' of git://github.com/hanhan1978/junks