Merge branch 'mat-devel'master
treed239c44e6fb8fccff0d011b0f95da223877dee68
-rw-r--r-- 14 .gitignore
-rw-r--r-- 367 CONCEPTION_CLASSES_txt
-rw-r--r-- 578 Makefile
-rw-r--r-- 1978 REPONSES
drwxr-xr-x - math
drwxr-xr-x - testing