put call parity
Merge pull request #2 from louissmit/bugfixes

Bugfixes
Merge pull request #1 from louissmit/putcallparity

put call parity
delta convergence
remove pyc
Merge branch 'master' into putcallparity
compute mat fix
Merge pull request #3 from louissmit/fix_computemat

Fix computemat
Merge remote-tracking branch 'origin/bugfixes'

Conflicts:
	blackscholes.pyc
	ex1.py
merge oscillations
final assignment 1
Merge remote-tracking branch 'origin/bugfixes'

Conflicts:
	blackscholes.pyc
	ex1.py
assignment 2 scratch
Merge branch 'louisassignment2' into plotsassignment2

Conflicts:
	ex2.py
assignment 2 plots