Merge pull request #1 from fr3ndyl33/master

latest update
updated
Merge branch 'master' of https://github.com/DewiRS96/TKPPL-bespoke-flatizen

Conflicts:
	Log book.txt
Merge pull request #24 from DewiRS96/master

Updated
Merge pull request #2 from fr3ndyl33/master

latest update