Merge commit 'cff53799749855b8ce29e822096a682accdae5a5'

diff --cc cgilite/.gitignore
index 0000000000000000000000000000000000000000,5c9950ae1c74eb4a290c3887873f567f85c3de4d..5c9950ae1c74eb4a290c3887873f567f85c3de4d
mode 000000,100644..100644
--- /dev/null
--- 2/.gitignore
+++ b/cgilite/.gitignore

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
index 0000000000000000000000000000000000000000,44d4e0d7d16aa8aaab7638da20debc775f9770c3..44d4e0d7d16aa8aaab7638da20debc775f9770c3
mode 000000,100755..100755
--- /dev/null
--- 2/markdown.awk
+++ b/cgilite/markdown.awk

diff --cc cgilite/session.sh
Simple merge

diff --cc cgilite/storage.sh
Simple merge

diff --cc cgilite/users.sh
index 0000000000000000000000000000000000000000,6a6833e96c592043669006bbeec91b628a70667e..6a6833e96c592043669006bbeec91b628a70667e
mode 000000,100755..100755
--- /dev/null
--- 2/users.sh
+++ b/cgilite/users.sh