develop test
Merge branch 'master' of github.com:sugimo/branch_test

Conflicts:
	index.html