confict
Merge branch 'master' of https://github.com/sysu-yunz/pract_2014
youcan you up