test for gitignore
added define parm
Merge remote-tracking branch 'origin/master'