change .gitignore to ignore parameters.yml
Merge remote-tracking branch 'origin/master'