waste time..
Merge branch 'master' of https://github.com/masato-ka/SampleProject
Merge branch 'master' of https://github.com/masato-ka/SampleProject

Conflicts:
	izuru_watanabe.txt
Merge branch 'master' of https://github.com/masato-ka/SampleProject

Conflicts:
	izuru_watanabe.txt
Merge branch 'master' of https://github.com/masato-ka/SampleProject

Conflicts:
	izuru_watanabe.txt