Filled in basic concepts
Merge branch 'master' into conditions_db
Merge branch 'conditions_db'