tambah dan edit
Merge branch 'master' of github.com:danz0/hm1