* failed merge with master
treead42312a5c66de90dd04df38713a4a4ba51e4462
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-- 562 img2.php
-rw-r--r-- 163 index.php
-rw-r--r-- 2304 rss.php
-rw-r--r-- 661 style.php