Merge branch 'master' of https://github.com/summit2013/10_16_homework
Merge branch 'master' of https://github.com/0591zht/test