Add functions
Merge branch 'master' of https://github.com/jianpingjwang/quantitative_finance

Conflicts:
	README