mac-mini
Merge branch 'master' of https://github.com/IkedaYutaro/master-thesis

Conflicts:
	thesis_3.dvi
	thesis_3.fdb_latexmk
	thesis_3.log
	thesis_3.pdf