added gitIgnore
Merge branch 'dev' into merge