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

Conflicts:
	proposal/proposal.bbl
	proposal/proposal.bib