updated gitignore for pycache files and added merge_sort