Updated parseHAIbyBinLabel to use data_utils.parseFileWithIndex, and added merge_data.py
Merge branch 'master' of https://github.com/pinesol/intro-ds-hai

Conflicts:
	src/hai_data_cleanup.py