ImageProc Fouriertests
Merge branch 'origin/master'

Conflicts:
	src/imageProc/imageprocessing.java