Merge https://github.com/coderkid/tkppl-bespoke-project
Merge branch 'master' of https://github.com/coderkid/tkppl-bespoke-project
Membuat slide tentang Ucok Durion
Merge branch 'master' of https://github.com/coderkid/tkppl-bespoke-project

Conflicts:
	public/index.html
Menambah gambar pada slide Ucok Durian
Merge pull request #18 from matsuyaogawa/master

Membuat Slide Ucok Durian by rahmatsyah
merge from hadi and resolve conflict in log_book.txt
merge from franseda and add log_book
perbaiki slide merdeka walk dan perbaiki width dan height image size
change README.md
Merge https://github.com/coderkid/tkppl-bespoke-project

Conflicts:
	public/index.html
	public/mie aceh titi bobrok.html
	src/index.jade
	src/mie aceh titi bobrok.jade