first yaginuuu
@修正
Merge branch 'master' of github.com:whitech0c0/practice_social_coding

Conflicts:
	index.html