Merge branch 'mat-devel'
tree824c93be7962ffcf904a9d47ee934dce2d8c8198
-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