merge
Merge branch 'master' of https://github.com/simonscott/ee290c-project-mimo

Conflicts:
	report/ee290c_mimo_report.pdf
final changes to report