Feature master

merge for .gitignore