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

@@ -14,5 +14,6 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
         System.out.println("hello");
         System.out.println(HanLP.segment("你好，欢迎使用HanLP汉语处理包！"));
+        System.out.println("haha");
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -8,32 +8,14 @@
 
     <TextView
         android:layout_width="100dp"
-        android:layout_height="90dp"
+        android:layout_height="40dp"
         android:text="Hello World!"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintHorizontal_bias="0.249"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.489" />
-
-    <Button
-        android:id="@+id/button"
-        android:layout_width="165dp"
-        android:layout_height="110dp"
-        android:text="登录"
-        tools:layout_editor_absoluteX="380dp"
-        tools:layout_editor_absoluteY="240dp"
-        android:textSize="40sp"/>
-
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="历史记录"
-        tools:layout_editor_absoluteX="100dp"
-        tools:layout_editor_absoluteY="453dp"
-        android:textSize="36sp"/>
+        app:layout_constraintVertical_bias="0.489"
+        android:layout_marginLeft="100dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>