commit .gitignore:  + defaultParameters.py
merging
small fix