Added 3 txt-files
Modified Main1.java, Main2.java, Main3.java.
Merge branch 'Elena'
Changed 6 files
Merge branch 'master' into Yevgeniy

Resolved Conflicts:
	mchireychik/Main1.java
	mchireychik/Main2.java
	mchireychik/Main3.java
Ignoring three *.orig files
Modified lena1.txt, lena2.txt, lena3.txt.
Revert "Ignoring three *.orig files"

This reverts commit 0d417a2a1a745f9e7a8437804b51c5efac843da7.
Merge branch 'master' into mchireychik

Conflicts:
	Yevgeniy/first.txt