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