test
Merge branch 'master' of https://github.com/feelX46/NumSim.git

Conflicts:
	SuperFlow3000/Grid/Gridfunction.cpp
Merge branch 'master' of https://github.com/feelX46/NumSim.git
test gridfunction
Merge branch 'master' of https://github.com/feelX46/NumSim.git