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

Conflicts:
	application/tea.tex