First commit
Merge branch 'master' into ladoshki

Conflicts:
	README
First commit