mypc720-16-58
Merge branch 'master' of https://github.com/HelinYoung/pub1.0version

Conflicts:
	2ndHW.py
	3rdHW.py
repair
'2013-08-31-18:44:40'
Merge branch 'master' of https://github.com/HelinYoung/pub1.0version