add ichiren1
Merge pull request #2 from FUNService/ichiren1/addIchiren1

add ichiren1
resolve conflict