change the type of some images from .png to .jpg
Modify pics
Merge branch 'lvzh' into www0
Merge branch 'www0' of https://github.com/EduPepperPDTesting/pepper2013-testing into star
Discussion style modification