modified: confrict1
Merge pull request #13 from machidyo/ymt/feature/confrict1

confrict1
Merge branch 'ymt/develop' into ymt/feature/confrict2

Conflicts:
	paiza/D003/D003/Program.cs