fix info
add a file
Merge branch 'master' of github.com:fengpod/test