Added hpp data structure files to Makefile
COrrected race condition bug by switching to safeIncrement function