local change
Merge branch 'master' of github.com:jikk/jikk_web

Conflicts:
	proposal/proposal.toc
Merge branch 'master' of github.com:jikk/jikk_web
Merge branch 'master' of github.com:jikk/jikk_web