local changes
Merge branch 'chronograph' of https://github.com/limingjie/algorithm into chronograph

Conflicts:
	MyTimerTest.cpp