A few necessary changes...
Adding these again, apparently...
:Merge branch 'master' of github.com:Gordonei/ForwardFinancialFramework

Conflicts:
	Platforms/MaxelerFPGA/MaxelerFPGA_MonteCarlo.py
	bin/mc_solver_ks_test.py