Merge branch 'master' of https://github.com/cmwslw/vhdl_fft

Conflicts:
	docs/final_report/final_report.aux
	docs/final_report/final_report.pdf