fix up from merge
tree9849c1e3420e1d55730b4ea11660c44ffafab19d
-rw-r--r-- 6130 .gitignore
-rw-r--r-- 2135 README.md
drwxr-xr-x - htdocs
drwxr-xr-x - plugins
drwxr-xr-x - src