edited .gitIgnore
Merge branch 'master'