ざっくり、だいたい完成。細かい修正あとで…
Merge commit '47f44e887085bba40e36c5d2b8ef011305bff570'

Conflicts:
	views/mypage/index.jade