add proftpd2.conf
update server zhs
Merge branch 'master' of github.com:jixiuf/dotfiles