test
add message
Merge pull request #7 from kairiTakemura/master

ありがとうございます！
added some text in welcome/index.html.erb
Merge pull request #9 from sokky/master

了解しました！
Solved conflict at app/views/welcome/index.html.erb