merge conflict
merge conflict

sf-takaki-umemura/angular-study,sf-takaki-umemura/angular-study,jpwiddy/NgDotNetCore,asadsahi/AspNetCoreSpa,hillinworks/echoisles,sf-takaki-umemura/angular-study,asadsahi/AspNetCoreSpa,sf-takaki-umemura/angular-study,jpwiddy/NgDotNetCore,mak-in/sf-attendance,jpwiddy/NgDotNetCore,jpwiddy/NgDotNetCore,hillinworks/echoisles,s-gotou/SF-kinjiro,s-gotou/SF-kinjiro,mak-in/sf-attendance,asadsahi/AspNetCoreSpa,asadsahi/AspNetCoreSpa,mak-in/sf-attendance,hillinworks/echoisles,s-gotou/SF-kinjiro,mak-in/sf-attendance,s-gotou/SF-kinjiro,hillinworks/echoisles,jpwiddy/NgDotNetCore