Edits to fix errors
Merge branch 'master' of github.com:itchy8me/fft_peripheral

Conflicts:
	c_2048to16x128_shifter.vhd
	fft_peripheral.vhd
	scripts/out.txt