* this is a bad way of doing merges :( - I am now trying to put into master
tree77248ae90a701caf5d0031154398834e9298a367
drwxr-xr-x - _pages
drwxr-xr-x - _res
drwxr-xr-x - adm
-rw-r--r-- 1718 config.inc.php
-rw-r--r-- 313 image.php
-rw-r--r-- 563 img2.php
-rw-r--r-- 163 index.php
-rw-r--r-- 2304 rss.php
-rw-r--r-- 661 style.php