Merge commit '2af4a30f8cf19d4e205888305e30bfc44525ebc5'

diff --cc cgilite/cgilite.sh
Simple merge

diff --cc cgilite/common.css
Simple merge

diff --cc cgilite/file.sh
Simple merge

diff --cc cgilite/markdown.awk
Simple merge

diff --cc cgilite/users.sh
Simple merge