Updated timing tests to remove user input
Merge branch 'master' of https://github.com/gaelenh/magnoparvo-stim

* 'master' of https://github.com/gaelenh/magnoparvo-stim:
  Added contrast

Conflicts:
	experiments/magno.py