Missed two merges
treeb6f1a14df60237cedbf830c0e80fc74a2aa480b3
-rw-r--r-- 6130 .gitignore
-rw-r--r-- 2135 README.md
drwxr-xr-x - htdocs
drwxr-xr-x - plugins
drwxr-xr-x - src