new
mrgre
retry
s
Merge branch 'new'

Conflicts:
	us.txt