ごめ
Merge branch 'master' of https://github.com/opendatadayjapan/datarabbit

Conflicts:
	site/js/model.js
	site/js/view.js