fixed some part in part 1
tak tau suruh saya commit apa
Merge branch 'YuhJingPunyaEdit'