全体的に改修
Merge branch 'master' of http://github.com/sakaki0214/temp_pc

Conflicts:
	index.html