test
diff --git a/file.txt b/file.txt
index 30d74d2..6d599a7 100644
--- a/file.txt
+++ b/file.txt
@@ -1 +1,2 @@
-test
\ No newline at end of file
+test
+test again!!
\ No newline at end of file
diff --git a/nuttapon_test.txt b/nuttapon_test.txt
new file mode 100644
index 0000000..23f16f8
--- /dev/null
+++ b/nuttapon_test.txt
@@ -0,0 +1 @@
+TEST!
\ No newline at end of file
gumiichigopine　ファイル修正
Merge branch 'master' of https://github.com/studentaiueo/foursection
テスト
テスト
norita_test.txt追加
Merge branch 'master' of https://github.com/studentaiueo/foursection
hirano test
miyamoto test
test
test/test.txt test
test
Merge branch 'master' of https://github.com/studentaiueo/foursection
branch test
Merge branch 'develop' into foosee_branch

Conflicts:
	readme.txt