conflict merge, bugfixes
-rw-r--r-- 947 Makefile
drwxr-xr-x - doc
drwxr-xr-x - src