commit 4
Merge branch 'master' of https://github.com/deceptiondrakes/deneme1

Conflicts:
	hi.txt