Pengeditan Readme.md dan Penambahan Log Book.txt
manual merge conflict
Merge branch 'Jimmytanuwijaya-master'