lek edit
Merge https://github.com/icomm2010/test

Conflicts:
	test.txt