ramm 11-26
Merge branch 'master' of https://github.com/ramma471/test

Conflicts:
	readme.txt