Commit by Alex
jihji
Merge branch 'master' of https://github.com/aignat/ex

Conflicts:
	file1.txt