diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d9de1d89fc6a8a00a6ec208b35f1475c6c8b7ced..6f00cabbe13b4382e5534704db3bbde17cb01af2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,14 +11,16 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".Dashboard"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:label="DashBoard"
+            android:theme="@style/AppTheme.NoActionBar"></activity>
+        <activity android:name=".LoginActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".SignUpActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/taskboxx/LoginActivity.java b/app/src/main/java/com/example/taskboxx/LoginActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..fb2708651a3c22107ae00cbea99baba9c1e6fb79
--- /dev/null
+++ b/app/src/main/java/com/example/taskboxx/LoginActivity.java
@@ -0,0 +1,28 @@
+package com.example.taskboxx;
+
+import android.content.Intent;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Toast;
+
+public class LoginActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_login);
+    }
+
+    public void Login(View view){
+        Toast.makeText(this, "Login Successful", Toast.LENGTH_SHORT).show();
+        Intent dashboardintent = new Intent(this,Dashboard.class);
+        startActivity(dashboardintent);
+    }
+
+    public void gotoSignUp(View view){
+        Toast.makeText(this, "Great Idea!", Toast.LENGTH_SHORT).show();
+        Intent signupintent = new Intent(this,SignUpActivity.class);
+        startActivity(signupintent);
+    }
+}
diff --git a/app/src/main/java/com/example/taskboxx/SignUpActivity.java b/app/src/main/java/com/example/taskboxx/SignUpActivity.java
new file mode 100644
index 0000000000000000000000000000000000000000..95a619f97e8af879f4815b64bd9a1f1c9ca171fe
--- /dev/null
+++ b/app/src/main/java/com/example/taskboxx/SignUpActivity.java
@@ -0,0 +1,24 @@
+package com.example.taskboxx;
+
+import android.content.Intent;
+import android.support.annotation.Nullable;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Toast;
+
+public class SignUpActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_sign_up);
+    }
+
+    public void SignUp(View view){
+        Toast.makeText(this, "Registered!", Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "Please Log In to Proceed", Toast.LENGTH_SHORT).show();
+        Intent loginintent = new Intent(this,LoginActivity.class);
+        startActivity(loginintent);
+    }
+}
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2b745f1e9f833323e26ba69ece105a76f1eb7022
--- /dev/null
+++ b/app/src/main/res/layout/activity_login.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.example.taskboxx.LoginActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_below="@+id/Pass_textLayout"
+        android:paddingLeft="125dp"
+        android:paddingRight="125dp"
+        android:layout_marginTop="20dp">
+    <Button
+        android:id="@+id/login"
+        style="@style/Widget.AppCompat.Button.Borderless"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#EEEEEE"
+        android:onClick="Login"
+        android:text="Login" />
+    </LinearLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/RollNo_textLayout"
+        android:layout_centerInParent="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_RollNo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="text"
+            android:hint="College Roll No." />
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:id="@+id/Pass_textLayout"
+        android:layout_below="@+id/RollNo_textLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="textPassword"
+            android:hint="Password" />
+    </android.support.design.widget.TextInputLayout>
+
+    <ImageView
+        android:id="@+id/Amrita_Logo"
+        android:layout_width="160dp"
+        android:layout_height="160dp"
+        android:layout_above="@+id/RollNo_textLayout"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="30dp"
+        app:srcCompat="@mipmap/ic_launcher" />
+
+    <TextView
+        android:id="@+id/launch_signup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="37dp"
+        android:text="Don't Have an Account? Create one"
+        android:onClick="gotoSignUp"/>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml
new file mode 100644
index 0000000000000000000000000000000000000000..257afb328c65ee44da054f7c59635f01fdf6a2d1
--- /dev/null
+++ b/app/src/main/res/layout/activity_sign_up.xml
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:context="com.example.taskboxx.SignUpActivity">
+<RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/Explanation"
+        android:textColor="#AA000000"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginLeft="25dp"
+        android:layout_marginRight="25dp"
+        android:layout_marginTop="25dp"
+        android:text="Enter the following details to Sign up for TaskBoxx, your personal project and task manager!" />
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpName_textLayout"
+        android:layout_below="@+id/Explanation"
+        android:layout_marginTop="20dp"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_Name_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="text"
+            android:hint="Name" />
+    </android.support.design.widget.TextInputLayout>
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="250dp"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpRollNo_textLayout"
+        android:layout_below="@+id/SignUpName_textLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_RollNo_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="text"
+            android:hint="Roll No." />
+    </android.support.design.widget.TextInputLayout>
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="200dp"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpDept_textLayout"
+        android:layout_below="@+id/SignUpRollNo_textLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_Dept_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="text"
+            android:hint="Department" />
+    </android.support.design.widget.TextInputLayout>
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="150dp"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpCGPA_textLayout"
+        android:layout_below="@+id/SignUpRollNo_textLayout"
+        android:layout_toRightOf="@+id/SignUpDept_textLayout"
+        android:layout_toEndOf="@+id/SignUpDept_textLayout">
+        <EditText android:id="@+id/input_CGPA_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="10dp"
+            android:inputType="text"
+            android:hint="CGPA" />
+    </android.support.design.widget.TextInputLayout>
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpSem_textLayout"
+        android:layout_below="@+id/SignUpName_textLayout"
+        android:layout_toEndOf="@+id/SignUpRollNo_textLayout"
+        android:layout_toRightOf="@+id/SignUpRollNo_textLayout">
+        <EditText android:id="@+id/input_Sem_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="10dp"
+            android:inputType="number"
+            android:hint="Sem" />
+    </android.support.design.widget.TextInputLayout>
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpAOI_textLayout"
+        android:layout_below="@+id/SignUpDept_textLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_AOI_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="text"
+            android:hint="Areas of Interest" />
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpemail_textLayout"
+        android:layout_below="@+id/SignUpAOI_textLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_email_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="textEmailAddress"
+            android:hint="Contact Email Address" />
+    </android.support.design.widget.TextInputLayout>
+
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/SignUpContact_textLayout"
+        android:layout_below="@+id/SignUpemail_textLayout"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+        <EditText android:id="@+id/input_Contact_SignUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="30dp"
+            android:layout_marginLeft="30dp"
+            android:inputType="number"
+            android:hint="Contact No." />
+    </android.support.design.widget.TextInputLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_below="@+id/SignUpContact_textLayout"
+        android:paddingLeft="125dp"
+        android:paddingRight="125dp"
+        android:layout_marginTop="20dp">
+        <Button
+            android:id="@+id/SignUp"
+            style="@style/Widget.AppCompat.Button.Borderless"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="#EEEEEE"
+            android:onClick="SignUp"
+            android:text="Sign Up" />
+    </LinearLayout>
+
+</RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 1ea4bd05500327c0032ade1bb0cb00e0fa032c22..b78a0b86c939620b6f05483ce45c4d3ef0ef595e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files