Merge error
Merge branch 'master' of https://github.com/grozensmith/182-final-project

Conflicts:
	binomialOption.pyc
	data.pyc
small changes to volatility