Merged conflict
-rw-r--r-- 20 .gitignore
-rw-r--r-- 2425 Configure.pl
drwxr-xr-x - build
-rw-r--r-- 438 kakapo_cfg.tmpl
drwxr-xr-x - library
drwxr-xr-x - plumage
drwxr-xr-x - released
drwxr-xr-x - src
drwxr-xr-x - t