untracked bin
moved to fft instead of fftw
Merge branch 'master' of https://github.com/jwbowler/etaBasement

Conflicts:
	bin/etaBasement_debug