in
Merge remote-tracking branch 'origin/master'

Conflicts:
	POJ/input.txt
nf
pj1084
pj3691