explained oscillations
Merge remote-tracking branch 'origin/bugfixes'

Conflicts:
	blackscholes.pyc
	ex1.py
merge oscillations