update solutions
Merge remote-tracking branch 'origin/master'

Conflicts:
	acm-summary/tex/Train0818.tex