Created debug macros
Merge branch 'master' of https://github.com/benedictchen/cthehardway

Conflicts:
	Makefile
	dbg.h