3

3
Merge branch 'master' of https://github.com/swangi/Shi-PHD

Conflicts:
	.texpadtmp/8/conclusions.aux
	.texpadtmp/9_backmatter/achievement.aux
	.texpadtmp/9_backmatter/declaration.aux
	.texpadtmp/thesis.aux
	.texpadtmp/thesis.blg
	.texpadtmp/thesis.lof
	.texpadtmp/thesis.log
	.texpadtmp/thesis.lot
	.texpadtmp/thesis.synctex.gz
	.texpadtmp/thesis.toc
	4/febased_thermal.tex
	thesis.pdf