merge milner
merge
milner params
Merge branch 'MotionPerception/wip' of https://github.com/bernhardkaplan/OculomotorControl into MotionPerception/wip

Conflicts:
	simulation_parameters.py
Merge branch 'MotionPerception/wip' of https://github.com/bernhardkaplan/OculomotorControl into MotionPerception/wip

Conflicts:
	simulation_parameters.py
Merge branch 'MotionPerception/wip' of https://github.com/bernhardkaplan/OculomotorControl into MotionPerception/wip

Conflicts:
	simulation_parameters.py
Merge branch 'MotionPerception/wip' of https://github.com/bernhardkaplan/OculomotorControl into MotionPerception/wip
milner sim params