again update
Merge branch 'newfeature'

Conflicts:
	readme.txt