version 140711
Merge branch 'master' of github.com:huailiting/coding_file