1633 28/10/2014 Wangchen DAI
1643 28/10/2014 W DAI

Merge branch 'master' of github.com:davidhoo1988/EE5414-MiniProject

Conflicts:
	bibfile.bib
	report.aux
	report.bbl
	report.blg
	report.log
	report.pdf
	report.tex