no message
edit log book
Merge branch 'master' of https://github.com/stevenhandoko94/tkppl-bespoke-flatizen into stevenhandoko94-master

Conflicts:
	Log book.txt
Merge branch 'stevenhandoko94-master'
update dan finishing konten Flatizen.jade
Merge branch 'master' of git://github.com/fr3ndyl33/tkppl-bespoke-flatizen

Conflicts:
	Log book.txt