Merge branch 'glen'
Merge branch 'glen'
Updated gitignore to hide answers.txt
Merge branch 'glen'
HeapFile
Merge branch 'fay'
Finally done! Finished HeapFile and fixed HeapPage