.gitattribures modified to avoid merging some files
.gitattribures modified to avoid merging some files
Merge branch 'master' into demo