Initial commit
Removing parameters.ini
merging fixed