test aangepast
Merge branch 'master' of https://github.com/masimun/AMFBach

Conflicts:
	source/AMFunction_test.cpp
	source/Solver_test.cpp