Fixes to benchmark so it now works properly. Had typos in the input/result set and wasn't getting the result time out properly
Merge branch 'master' into Adam-Panzica

Conflicts:
	challenge1/src/Benchmark/Benchmark.py