Merge branch 'express' of http://gitlab.yanky.cn/liaili/www.fudou6.com into express

# Conflicts:
#	views/layout.hbs

views/layout.hbs

@@ -29,15 +29,29 @@
     <h2>400-879-9900</h2>
     <!--<hr class="line-separate"/>-->
     <p class="copyright">Copyright2016 <span>shuniu</span> All Right Reserved&copy;2014-2015 杭州枢纽科技有限公司 版权所有</p>
+<<<<<<< HEAD
     <address>
         浙江省杭州市余杭区良睦路1288号梦想小镇5-305
         <br>上海市浦东新区福山路458号同盛大厦1808室 <br>
         <a href="mailto:hr@shuniu.com">E-mail:hr@shuniu.com</a>
     </address>
+=======
+    <address>浙江省杭州市余杭区良睦路1288号梦想小镇5-305 E-mail: <a href="mailto:hr@shuniu.com">hr@shuniu.com</a></address>
+    <address>上海市浦东新区福山路458号同盛大厦1808室</address>
+>>>>>>> 546ba5723d0162ab25246abb551367aad882f2e0
 </footer>
 <script src="/javascripts/jquery-1.8.3.min.js"></script>
 {{#each scripts}}
     <script src="/javascripts/{{this}}.js"></script>
 {{/each}}
+<script>
+    var _hmt = _hmt || [];
+    (function() {
+        var hm = document.createElement("script");
+        hm.src = "//hm.baidu.com/hm.js?4b407617527991fb96f9d8520f67e0e2";
+        var s = document.getElementsByTagName("script")[0];
+        s.parentNode.insertBefore(hm, s);
+    })();
+</script>
 </body>
 </html>