import new .htaccess from prod
add carte directory to gitignore
import edited pictures from prod
merge origin/prod