Tidy up whitespace
Merge branch 'master' of github.com:s-kenny/benchmark

Conflicts:
	Benchmark/runner.h