2
Merge branch 'master' of https://github.com/akeske/testt

Conflicts:
	read.txt