merge
Merge branch 'master' of https://github.com/CodingYue/acm-icpc

Conflicts:
	acm-summary/tex/Train0818.tex
lalallala