merge

README.md

@@ -5,10 +5,8 @@ test-project - I edited at Web
 * I want to break free - I edited at oss032@
 * 05031213 - at ssh
 * 05031230 - at pc
-<<<<<<< HEAD
 * 05031254 - at pc edit again
-=======
 * 05031259 - at web
->>>>>>> 2653afc37f9f3bd97c4f07e5e0f8e72d3aeccf0a
 * 1300 PC에서 합침
 * 1313 pc에서 또 고침
+* 1311 web에서 또 고쳤어요