Merging
Merge branch 'master' of https://github.com/fxsrt10/floatFun

Conflicts:
	floatFun/testProj/testProj-csharp.sln
	floatFun/testProj/testProj.sln