a
a
Merge branch 'feature/test' into develop
Merge remote-tracking branch 'origin' into develop

Conflicts:
	index.html
Merge pull request #11 from t-taira/develop

Develop