baris2

baris2
wkkk
Merge branch 'master' of https://github.com/byanjati/github2

Conflicts:
	test.txt
Merge branch 'baru'