1529 27/10/2014 Wangchen DAI
Merge branch 'master' of github.com:davidhoo1988/EE5414-MiniProject

Conflicts:
	report.aux
	report.log
	report.pdf
	report.synctex.gz
	report.tex.bak