t
t
t
Merge remote-tracking branch 'origin/master'

Conflicts:
	notebooks/VerticalJump.ipynb