add .gitignore from Gregory
Now the .gitignore file works correctly
pull from Gregory
commit .gitignore
pull from master + adding web/css et web/js