merge
added ignorind pycharm files