c07 final? redone
Merge branch 'atc' of https://github.com/Pharmacon/knowledgeBase into atc
first concepts
Merge branch 'gleb-s' of https://github.com/Pharmacon/knowledgeBase into gleb-s