diff --git a/README.md b/README.md
index bfd9841..bc1f149 100644
--- a/README.md
+++ b/README.md
@@ -7,9 +7,27 @@
 =======
 hogehoge
 
-#### process push
-* git pull
-* git add hoge/hoge.txt
+### process push
+* git clone URL
+
+Edit the umko file!  
+* git add hoge/hoge.file 
 * git commit -m "hogehoge"
 * git push
+<<<<<<< HEAD
 >>>>>>> ac455413edae60201a4d373965b37f843025223f
+=======
+
+#### 誰かが push した後は pull する
+* git pull 
+
+|git push|アップロード|
+|----|----|
+|git fetch|ダウンロード|
+|git merge|2つのブランチを合流|
+
+
+| Left align | Right align | Center align |
+|:-----------|------------:|:------------:|
+|左|右|中央|
+>>>>>>> 5eeb773ad7d0d42f15d572384ba58480fa590edc
diff --git a/otani/jaist_sl.odp b/otani/jaist_sl.odp
new file mode 100644
index 0000000..cd1e87d
--- /dev/null
+++ b/otani/jaist_sl.odp
Binary files differ
diff --git a/otani/jaist_sl.pdf b/otani/jaist_sl.pdf
new file mode 100644
index 0000000..626863c
--- /dev/null
+++ b/otani/jaist_sl.pdf
Binary files differ
diff --git a/otani/tyukan.pdf b/otani/tyukan.pdf
new file mode 100644
index 0000000..77006c1
--- /dev/null
+++ b/otani/tyukan.pdf
Binary files differ