結合前
Merge remote-tracking branch 'origin/user/imo' into user/sr

Conflicts:
	res/layout/activity_today.xml
	src/com/example/mytai_imo/TodayActivity.java
Merge remote-tracking branch 'origin/user/imo' into user/sr

Conflicts:
	res/layout/activity_today.xml
	src/com/example/mytai_imo/TodayActivity.java
Merge remote-tracking branch 'origin/user/sr' into user/imo
しゅれっくの分担をまーじよー