Bug fix
Rename `make test` to `make check`
Use -isystem to specify the gtest header directory
Fix .PHONY
Merge branch 'master' into macro

Conflicts:
	Makefile