comment1
Merge branch 'master' of https://github.com/perspolis/Saamic

Conflicts:
	test1.txt