Ref, chap 1.
Merge branch 'master' of https://github.com/sinhpham/thesis

Conflicts:
	thesis_template.pdf