added .gitignore and heap/merge sort