commit before pull
Merge branch 'layer2' of https://github.com/Weil0ng/cs270 into layer2

Conflicts:
	Globals.h

commit before pull
Merge branch 'layer2' of https://github.com/Weil0ng/cs270 into layer2

merge
Enhanced error handling with file, line #, func name output
Rewrite bmap with error handling