directory change
Merge branch 'master' of https://github.com/sakaki0214/temp_sp

Conflicts:
	index.html