Added 3 txt-files
Merge branch 'Elena'
Changed 6 files
Merge branch 'master' into Yevgeniy

Resolved Conflicts:
	mchireychik/Main1.java
	mchireychik/Main2.java
	mchireychik/Main3.java