baris 3

commit wahyu
Merge branch 'master' of https://github.com/byanjati/githubTest

Conflicts:
	git.txt