6th
Merge branch 'master' of https://github.com/akokubo/testg

Conflicts:
	index.html