自宅
とりあえず
仕方なく
Merge branch 'master' of https://github.com/maplesystems/KeepMyShapeWeb

Conflicts:
	app/View/Elements/User/common_header.ctp
？