Merge branch 'master' of ssh://feistymeow.org/feisty_meow
-rw-r--r-- 124 .gitignore
drwxr-xr-x - database
drwxr-xr-x - docs
drwxr-xr-x - graphiq
-rw-r--r-- 414 license.txt
-rw-r--r-- 205 makefile
drwxr-xr-x - nucleus
drwxr-xr-x - octopi
drwxr-xr-x - production
-rw-r--r-- 1317 readme.txt
drwxr-xr-x - scripts