finished writing proposal chapter
Merge branch 'master' of github.com:TakayukiSakai/thesis-bachelor

Conflicts:
	02-background.tex
	03-proposal.tex
	images/algo.xbb
	thesis.bib
	thesis.pdf