# HG changeset patch
# User KAMADA Kei <c110206@f.koeki-u.ac.jp>
# Date 1379410116 -32400
# Node ID cca599832df5eaa0fa2e7de5ddcb657a8e88a6e4
# Parent  400c0f06ae8d29fdb8e82c18d6898d086da7d4ba
merge

diff -r 400c0f06ae8d -r cca599832df5 staff/kei/main.JPG
Binary file staff/kei/main.JPG has changed