ignore .htaccess file
retry merging
Merge pull request #310 from code-couleurs/master

ignore .htaccess file