Tambah file

Signed-off-by: Joko Susanto <joko.susanto@indomog.com>
Merge branch 'master' of github.com:broklyngagah/jogja-mobile
edit line 1

Signed-off-by: Joko Susanto <joko.susanto@indomog.com>
Merge branch 'master' of github.com:broklyngagah/jogja-mobile

Conflicts:
	newfile.md

Signed-off-by: Joko Susanto <joko.susanto@indomog.com>