modification gitignore
Merge branch 'dev' of https://github.com/johnny3/shakyamouni into dev
maj générale style