Dave der 3.
Merge pull request #5 from jp90/Dave

Dave der 3.
Merge branch 'master' into JP

Conflicts:
	NumSimFluid.cpp