Merge branch 'master' of git.linkerplus.com:houyt/xinde11

shishikan.txt

@@ -9,7 +9,7 @@
     <!-- compiled css output -->
     <link href="/css/ionic.app.min.css" rel="stylesheet">
     <link href="/css/linker.min.css" rel="stylesheet">
-     <link href="/css/linker.max.css" rel="stylesheet">
+     <link href="/css/linker.max.css" rel="stylesheeth">
        <link href="/css/linker.first.css" >	
 	<link href="/css/linker.first.css">