Merge branch 'master' of /home/ahyangyi2/puzzles

Conflicts:
	mkfiles.pl
Merge branch 'master' of github.com:ahyangyi/sgt-puzzles