競合の修正、settinng画面の作成
Merge pull request #23 from yudai-ushiro/facebook

競合の修正、settinng画面の作成