Change the Makefile to respect CXX.
Merge branch 'master' of github.com:tgockel/json-voorhees

Conflicts:
	Makefile