Merge remote-tracking branch 'origin/master'

.gitignore

@@ -3,6 +3,7 @@ out/
 !**/src/main/**/out/
 !**/src/test/**/out/
 
+
 ### Eclipse ###
 .apt_generated
 .classpath

.idea/.gitignore

@@ -1,3 +1,4 @@
+
 # 默认忽略的文件
 /shelf/
 /workspace.xml

Computer.iml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />

src/computer/com.java

@@ -20,6 +20,7 @@ class JS extends JFrame implements ActionListener {
     public JS() {
         setBounds(100, 100, 400, 400);
         setTitle("计算器");
+        //aaa
         JMenuBar menubar = new JMenuBar();
         this.setJMenuBar(menubar);
         this.setLayout(new BorderLayout());