Added matplotlibrc to .gitignore file
Fixed merge conflict in .gitignore
Merge branch 'develop' of https://github.com/dfornika/ontarget-scripts into develop