corrected makefile for minerva to work with fftw3
Merge pull request #13 from RudoRoemer/Iterative-Solution

Iterative solution
Merge branch 'master' of https://github.com/RudoRoemer/Felix
added sample refinement image to git repository
Corrected conflict

Merge branch 'Iterative-Solution' of https://github.com/RudoRoemer/Felix into Iterative-Solution

Conflicts:
	src/makefile-minerva.GF