Merge branch 'master' of https://github.com/yuzinakamura/hamstar

Conflicts:
	paper.tex