modify master
add iss53
fixed the hotfix
add new footer style
fix the conflicts manually
belajar rebase, tambah belajar.txt