tokumoto form変えました
とくもと
Merge branch 'master' of https://github.com/kaz-igu/homework

Conflicts:
	.DS_Store
	horie(ishiyama)/.DS_Store
	tokumoto/.DS_Store
	tokumoto/twitter/.DS_Store
	tokumoto/twitter/index.html