javascriptが動かない
Merge branch 'master' of https://github.com/MimiTab/kakeibo

Conflicts:
	assets/www/index.html