commit 3 ls.txt
Merge branch 'master' into deve1

Conflicts:
	ls.txt
deve1 merge master
deve1 pull