merged .gitignore in from develop