crud aset sama risk tp blm disesuain lbh lanjut
Merge branch 'master' of https://github.com/rizkyduut/SIRISKA

Conflicts:
	views/site/index.php