'hoge'
Merge branch 'master' of https://github.com/raccoon-berry/yummy
'girl'
Merge branch 'master' of https://github.com/raccoon-berry/yummy
Revert "buildファイル削除"

This reverts commit dbd811a070f5b1a201f47a393715cd1e6e8b4caf.
Merge branch 'master' of https://github.com/raccoon-berry/yummy
Merge branch 'master' of https://github.com/raccoon-berry/yummy
結果画面のレイアウト変更
Merge branch 'master' of https://github.com/raccoon-berry/yummy

Conflicts:
	AndroidBootstrap/build/outputs/aar/AndroidBootstrap.aar
Merge branch 'master' of https://github.com/raccoon-berry/yummy