Merge pull request #7 from jp90/master

dave uptodate
inputfile ausgeben
Merge remote-tracking branch 'origin/Dave'
Merge remote-tracking branch 'origin/Dave'
Merge branch 'master' into Sina

Conflicts:
	NumSimFluid.cpp