diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2e6a713
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+<<<<<<< HEAD
+ignore.md
+=======
+temp1.txt
+ignore.md
+>>>>>>> ea554ea1cbc3c9c61fcb2d892ab77258ad2954ad
diff --git a/temp2.txt b/temp2.txt
new file mode 100644
index 0000000..cc628cc
--- /dev/null
+++ b/temp2.txt
@@ -0,0 +1 @@
+world
diff --git a/week1.md b/week1.md
new file mode 100644
index 0000000..14abc16
--- /dev/null
+++ b/week1.md
@@ -0,0 +1,11 @@
+# Week 1 과제 정리
+
+## 배운 내용
+- 변경사항 추가 (`git add`)
+- 커밋 생성 (`git commit`)
+- 브랜치 생성 및 이동 (`git branch`, `git checkout`)
+- 원격 저장소에 push (`git push`)
+
+## 한줄평
+- 브랜치를 잊지마
+