changes from the lecture
Merge branch 'master' of https://github.com/ConceptualBlending/conceptual_blending_project