Added the fft library to the git path
Added an unimplemented FFT_Task and semaphore
Fixed merge conflict
Fixed more merge conflicts