added pycharm settings dir ignore
merge