try again to fix makefile
Merge branch 'master' of https://github.com/eranpeer/FakeIt.git

Conflicts:
	tests/default_event_formatting_tests.cpp
Merge branch 'master' of https://github.com/eranpeer/FakeIt.git
fix makefile