Added Makefile.
Completed merge sorter.
Merge branch 'master' of github.com:nmaraston/UFT-Advanced-DB-Coursework

Conflicts:
	a2/run_iterator.cpp