bikin readme
Merge remote-tracking branch 'origin/master'

Conflicts:
	ada nih file gak.txt