server commit
server commit 2
Merge github.com:nathanesau/m4fe

Conflicts:
	.Rbuildignore
	.gitignore
	DESCRIPTION
	R/asianOption.R
	R/bdt.R
	R/blackScholes.R
	R/callGreeks.R
	R/currentStocks.R
	R/lognormal.R
	R/recursiveTree.R
	R/treeBasic.R
	R/treeDetails.R
	README.md
	m4fe.Rproj
	vignettes/bdt.rnw
	vignettes/blackScholesDerivation.rnw
	vignettes/geometricBrownianMotionProof.rnw
Merge github.com:nathanesau/m4fe
server commit