- add feature 4
change file 4
change 4 to 5
cahnged 4 to 6
Merge branch 'feature4' into dev

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

Conflicts:
	4.txt
Update 4.txt
- update file 4
Update 4.txt
change 2
Merge branch 'dev'