Added Timing
Merge remote-tracking branch 'origin/master'

Conflicts:
	task1/src/exploratorySimulation.py