another fix
Merge branch 'master' of github.com:InnerBalloons/data

Conflicts:
	debug/11397/index.txt
encoding