Feature 1.1 additional changes
adding gitattributes & gitignore
merge branch feature 1