diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94a25f7f4cb416c083d265558da75d457237d671
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
index 4671f651cb1733ecde088f5f799e55f5226e8e87..e9e1bfbb60cdf08ea58e276e56ac2d7065c44fee 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/LoginActivity.java
@@ -7,12 +7,29 @@ import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.w3c.dom.Text;
+
+
 public class LoginActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
+        final EditText name = (EditText)findViewById(R.id.name);
+        final EditText password = (EditText)findViewById(R.id.password);
+        final Button login = (Button)findViewById(R.id.login);
+        final TextView register = (TextView)findViewById(R.id.reg);
+        register.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent regintent = new Intent(getApplicationContext(),RegisterActivity.class);
+                startActivity(regintent);
 
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java b/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
index e936149c5926d014bac53d1839f7215d8d3d648f..18cb7f5a8deeb680b589df188589f933b31cc92f 100644
--- a/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
+++ b/app/src/main/java/com/example/chan24/smartplanner/RegisterActivity.java
@@ -2,6 +2,8 @@ package com.example.chan24.smartplanner;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.widget.Button;
+import android.widget.EditText;
 
 public class RegisterActivity extends AppCompatActivity {
 
@@ -9,5 +11,10 @@ public class RegisterActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_register);
+        final EditText user = (EditText)findViewById(R.id.user);
+        final EditText pass = (EditText)findViewById(R.id.pass);
+        final EditText mail = (EditText)findViewById(R.id.mail);
+        final Button signup =(Button)findViewById(R.id.signup);
+
     }
 }
diff --git a/app/src/main/res/layout/activity_register.xml b/app/src/main/res/layout/activity_register.xml
index ba7ddb6546c6a82ca52db6f20fcc2c927f55b5ca..b0ab4c4a81a537a9725d89c0c697be28a6a62ddd 100644
--- a/app/src/main/res/layout/activity_register.xml
+++ b/app/src/main/res/layout/activity_register.xml
@@ -39,15 +39,15 @@
         android:ems="10"
         android:layout_centerVertical="true"
         android:layout_alignEnd="@+id/pass"
-        android:id="@+id/editText3"
+        android:id="@+id/mail"
         android:hint="Email" />
 
     <Button
         android:text="sign up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/editText3"
+        android:layout_below="@+id/mail"
         android:layout_centerHorizontal="true"
         android:layout_marginTop="50dp"
-        android:id="@+id/button" />
+        android:id="@+id/signup" />
 </RelativeLayout>