untracking the .idea directory so that we don't have pycharm conflicts
merging