font
Merge branch 'master' of https://github.com/masamune2002/astronomy-demo

Conflicts:
	app/index.html