Merged fft and test code into single est function.
Updated comments
Merge branch 'master' of https://github.com/zeitlerd/Empirical-Spectral-Test

Conflicts: Resolved
	R/est.R