Add another file by matan.
Merge branch 'master' of https://github.com/amidana/demo1

Conflicts:
	ami1.txt