Update .gitignore
removed from mstr file
Merging master into old/master