added printf to see memory locations
Merge branches 'dev', 'master' and 'master' of github.com:iu-parfunc/onlineProfiling

Conflicts:
	niknatar_prototype/libzca-src-195/zca/src/zca_table.cpp