*Gridfunction-> !TODO Marvin *test_io fix (char*) warning
Merge branch 'master' of https://github.com/numsim1415/num
* work in progress!
Merge branch 'master' of https://github.com/numsim1415/num

Conflicts:
	Blatt1/Computation.cpp
	Blatt1/Gridfunction.hpp
* fix compile errors