added .htaccess to ignore
merged