change filr 4
Merge branch 'dev' of https://github.com/monkeydl/gittut into dev

Conflicts:
	4.txt