naik dua kali
Merge branch 'master' of https://github.com/aristosh/hackjak

Conflicts:
	src/com/kiri/hackjak/TrayekFragment.java