Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/example/cmknowledgegraph/MainActivity.java

app/src/main/java/com/example/cmknowledgegraph/MainActivity.java

@@ -4,14 +4,12 @@ import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 
-import com.hankcs.hanlp.HanLP;
-
 public class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+        System.out.println("haha");
     }
 }