edited docstring, reformatted
changing var names
ignore pycharm files
Merge branch 'pipeline' into develop