a
Merge remote-tracking branch 'origin' into feature/fuga

Conflicts:
	index.html
Merge pull request #10 from t-taira/feature/fuga

Feature/fuga