modified:   parse.sh
	modified:   resume.html
	modified:   template.en
	modified:   template.zh
	deleted:    test.html
Merge branch 'master' of github.com:Alwayswithme/ezresume