yg assign risk
Merge branch 'master' of https://github.com/rizkyduut/SIRISKA

Conflicts:
	controllers/RiskController.php
	views/risk/_form.php
	views/risk/create.php