家での変更
Merge branch 'master' of https://github.com/takmaru/MyLib

Conflicts:
	MyLib.sln