some info changed
Merge branch 'norchyux'

Conflicts:
	dd.txt