revised until 07
Joe's correction on markdown
changed order of glossary & software catalog