a
Merge branch 'master' of https://github.com/zanqi/algorithm

Conflicts:
	require_test/bench_mark.rb