Merge branch 'master' of https://github.com/ahmadpaudji/OzanSoft

Conflicts:
	oji testing.txt

Conflicts:
	oji testing.txt