Regenerated paper
Merge branch 'master' of https://github.com/yksuh/phd_thesis

Conflicts:
	proposal/paper.pdf
Merge branch 'master' of https://github.com/yksuh/phd_thesis

Conflicts:
	proposal/paper.pdf
Merge branch 'master' of https://github.com/yksuh/phd_thesis

Conflicts:
	proposal/paper.pdf
Merge branch 'master' of https://github.com/yksuh/phd_thesis

Conflicts:
	proposal/paper.tex
updated