Added template to header file.
Corrected templates for twoq
Merge branch 'master' of github.com:cyberfuzzie/HeapDB

Conflicts:
	CMakeLists.txt