updated .gitignore and moved .htaccess one directory up