file name change (minor)
file name change (minor)
linux commit
Merge branch 'master' of github.com:Chris35Wills/Python_scripts

Conflicts:
	FFT/Quadrant_FFT_moving_window.py
	functions/FFT_filter_functions.pyc
convex linux paths
resolve merge fail