20140802
update my code
Merge branch 'master' of https://github.com/songwzup/python_test.git