edited .gitIgnore
edited .gitIgnore
Merge branch 'master'