Merge branch 'master' of https://git.tartarus.org/simon/puzzles into widelines

diff --cc devel.but
Simple merge

diff --cc gtk.c
Simple merge

diff --cc pearl.c
Simple merge

diff --cc slant.c
Simple merge

diff --cc towers.c
Simple merge