wira edit
final
Merge branch 'master' of https://github.com/erisazani/Android-STB

Conflicts:
	baca saya.txt