diff --git a/public/index.html b/public/index.html
index dc51d5a..031d1e4 100644
--- a/public/index.html
+++ b/public/index.html
@@ -57,7 +57,7 @@
             <nav class="navbar navbar-static-top">
                 <div class="container">
                     <div class="navbar-header">
-                        <a href="../../index2.html" class="navbar-brand"><b>Ambition</a>
+                        <a href="index.html" class="navbar-brand"><b>Ambition</a>
                         <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse">
                 <i class="fa fa-bars"></i>
               </button>
diff --git a/public/pages/login.html b/public/pages/login.html
index d235efb..01b301d 100644
--- a/public/pages/login.html
+++ b/public/pages/login.html
@@ -43,42 +43,15 @@
         </div>
         <div class="row">
           <!-- /.col -->
-          <div class="col-md-2 col-md-offset-9">
+          <div class="col-md-3 col-md-offset-9">
             <button id="login" class="btn btn-success">登录</button>
           </div>
           <!-- /.col -->
         </div>
       <!--</form>-->
       <!-- 忘记密码 -->
-      <a href="#" data-toggle="modal" data-target="#myModal">忘记密码</a>
+      <a href="register.html">注册</a>
       <br/>
-      <!-- 模态框（Modal） -->
-      <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-        <div class="modal-dialog">
-          <div class="modal-content">
-            <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-                &times;
-              </button>
-              <h4 class="modal-title" id="myModalLabel">
-               忘记密码
-            </h4>
-            </div>
-            <div class="modal-body">
-              Please send a mail to lucio.yang@qq.com
-            </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-success" data-dismiss="modal">
-                关闭
-              </button>
-            </div>
-          </div>
-          <!-- /.modal-content -->
-        </div>
-        <!-- /.modal -->
-
-      </div>
-      <!-- /.modal fade -->
     </div>
       <!-- /.login-box-body -->
                
diff --git a/public/pages/register.html b/public/pages/register.html
new file mode 100644
index 0000000..d4a8cfa
--- /dev/null
+++ b/public/pages/register.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Ambition-敏捷开发项目管理工具</title>
+  <!-- Tell the browser to be responsive to screen width -->
+  <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+  <!-- Bootstrap 3.3.5 -->
+  <link rel="stylesheet" href="../bootstrap/css/bootstrap.min.css">
+  <!-- Font Awesome -->
+  <link rel="stylesheet" href="../plugins/font-awesome/css/font-awesome.min.css">
+  <!-- Theme style -->
+  <link rel="stylesheet" href="../dist/css/AdminLTE.min.css">
+
+  <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+  <!--[if lt IE 9]>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+</head>
+
+<body class="hold-transition login-page">
+  <div class="login-box">
+    <div class="row">         </div>
+    <div class="login-logo">
+      <span class="logo-lg"><b>Ambition</b></span>
+    </div>
+    <!-- /.logo -->
+      <div class="register-box-body">
+        <p class="login-box-msg">请注册</p>
+        <!--<form action="../../index.html" method="post">-->
+          <div class="form-group has-feedback">
+            <input id="name" type="text" class="form-control" placeholder="昵称">
+            <span class="glyphicon glyphicon-user form-control-feedback"></span>
+          </div>
+          <div class="form-group has-feedback">
+            <input id="email" type="email" class="form-control" placeholder="邮箱">
+            <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
+          </div>
+          <div class="form-group has-feedback">
+            <input id="phone" type="phone" class="form-control" placeholder="手机">
+            <span class="glyphicon glyphicon glyphicon-phone form-control-feedback"></span>
+          </div>
+          <div class="form-group has-feedback">
+            <input id="pwd1" type="password" class="form-control" placeholder="密码">
+            <span class="glyphicon glyphicon-lock form-control-feedback"></span>
+          </div>
+          <div class="form-group has-feedback">
+            <input id="pwd2" type="password" class="form-control" placeholder="重复密码">
+            <span class="glyphicon glyphicon-log-in form-control-feedback"></span>
+          </div>
+          <div class="row">
+            <div class="col-md-3 col-md-offset-9">
+              <button id="register" class="btn btn-info">注册</button>
+            </div>
+          </div>
+        <!--</form>-->
+      </div><!-- /.form-box -->
+    </div><!-- /.register-box -->
+               
+    </div>
+    <!-- /.register-box -->
+
+    <!-- jQuery 2.1.4 -->
+    <script src="../plugins/jQuery/jQuery-2.1.4.min.js"></script>
+    <!-- Bootstrap 3.3.5 -->
+    <script src="../bootstrap/js/bootstrap.min.js"></script>
+    <script>
+      $(document).ready(function(){
+       		$("#register").click(function(){
+       			var name=$("#name").val();
+       			var email=$("#email").val();
+       			var phone=$("#phone").val();
+       			var pwd1=$("#pwd1").val();
+       			var pwd2=$("#pwd2").val();
+          		if( name.length>0 && email.length>0 && phone.length>0 && pwd1.length>0 && pwd2.length>0 ){
+          		  if( pwd1!=pwd2 ){
+          		    alert("两次密码输入不相同！");
+          		  }else{
+          		    $.ajax({
+                    type: "post",
+                    dataType: "json",
+                    url:"/users.json",
+                    data: {
+                      "user[name]":name,
+                      "user[email]":email,
+                      "user[phone]":phone,
+                      "user[password]":pwd1
+                    },
+                    statusCode: {
+                      201: function() {// 请求成功
+                        alert("注册成功！");
+                        window.location.href="login.html";
+                      },
+                      422:function(){
+                        alert("输入不符合要求，请重新输入！");
+                      },
+                      401:function(){// 未授权
+                        alert("用户名或密码错误！");
+                      }
+                    }
+                  });
+          		  }
+          		}  	
+          		else{
+          			alert("请输入完整！");
+          		}
+       		});
+       	});
+    </script>
+</body>
+
+</html>
\ No newline at end of file
