modified:   test2.html
	deleted:    cqupt/getnew.php
Merge ssh://github.com/ai2010212279/cqupt

Conflicts:
	test2.html

	deleted:    cqupt/getnew.php
	new file:   getnew.php
	new file:   mynameisgood/new.tex
	modified:   test2.html
	modified:   test2.html