new version
gitignore
Merge branch 'master' of https://github.com/serezhka/Langevene

Conflicts:
	java/test/ru/ifmo/enf/fedorov/Main.java