残り時間をだしました
Main画面作成
Merge remote-tracking branch 'origin/ogura3570' into butyutyumpa
minitをminitesを変更しますた
たいしてかわってないです
Merge remote-tracking branch 'origin/butyutyumpa' into ogura3570

Conflicts:
	res/layout/activity_ride.xml
activity_main変更
Merge remote-tracking branch 'origin/ogura3570' into kento126
Merge remote-tracking branch 'origin/kento126'

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml