Merge remote-tracking branch 'origin/master'

Conflicts: README.md
Yuanchao-Xu · Jul 17, 2015 · e4e1578 · e4e1578
2 parents 99bcf40 + 24cb136
commit e4e1578
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/.Rproj.user/132DF987/sdb/s-BBFEEBAB/264A52D9 b/.Rproj.user/132DF987/sdb/s-BBFEEBAB/264A52D9
@@ -0,0 +1,17 @@
+{
+ "contents" : "# hyfo\nhyfo provides convenient Hydrological and Forecasting Tools\n\n\nIntroduction and user manual please click [here](http:https://yuanchao-xu.github.io/hyfo/)\n\n",
+ "created" : 1437136327439.000,
+ "dirty" : false,
+ "encoding" : "ASCII",
+ "folds" : "",
+ "hash" : "524127654",
+ "id" : "264A52D9",
+ "lastKnownWriteTime" : 1437136419,
+ "path" : "~/hyfo/README.md",
+ "project_path" : "README.md",
+ "properties" : {
+ },
+ "relative_order" : 1,
+ "source_on_save" : false,
+ "type" : "markdown"
+}
diff --git a/.Rproj.user/132DF987/sdb/s-BBFEEBAB/lock_file b/.Rproj.user/132DF987/sdb/s-BBFEEBAB/lock_file
diff --git a/README.md b/README.md
@@ -1,4 +1,6 @@
 # hyfo
 hyfo provides convenient Hydrological and Forecasting Tools
 
-Introduction and user manual please click [here](http:https://yuanchao-xu.github.io/hyfo/)
+
+Introduction and user manual please click [here](http:https://yuanchao-xu.github.io/hyfo/)
+