subrepo:
  subdir:   "cicm16/bibs"
  merged:   "3abd672"
upstream:
  origin:   "https://github.com/KWARC/bibs"
  branch:   "master"
  commit:   "3abd672"
git-subrepo:
  version:  "0.3.1"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "ea9af4f"

subrepo:
  subdir:   "cicm16/bibs"
  merged:   "7717574"
upstream:
  origin:   "https://github.com/KWARC/bibs"
  branch:   "master"
  commit:   "7717574"
git-subrepo:
  version:  "0.3.1"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "dd254bc"

subrepo:
  subdir:   "cicm16/bibs"
  merged:   "a001918"
upstream:
  origin:   "https://github.com/KWARC/bibs"
  branch:   "master"
  commit:   "a001918"
git-subrepo:
  version:  "0.3.1"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "b92b447"

subrepo:
  subdir:   "cicm16/bibs"
  merged:   "a001918"
upstream:
  origin:   "https://github.com/KWARC/bibs"
  branch:   "master"
  commit:   "a001918"
git-subrepo:
  version:  "0.3.1"
  origin:   "git@github.com:ingydotnet/git-subrepo.git"
  commit:   "f526cd4"

subrepo:
  subdir:   "cicm16/bibs"
  merged:   "aa046c8"
upstream:
  origin:   "https://github.com/KWARC/bibs"
  branch:   "master"
  commit:   "aa046c8"
git-subrepo:
  version:  "0.3.0"
  origin:   "???"
  commit:   "???"

# Conflicts:
#	cicm16/parts/conclusion.tex

Add a TODO list; Update the introduction; shorten the architecture
section