Merge pull request #110 from griffithlab/update_docs

Update docs
griffithlab · Apr 2, 2019 · 189fd4b · 189fd4b
2 parents 1f998a6 + 447105a
commit 189fd4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/docs/about.md b/docs/about.md
@@ -1,5 +1,5 @@
-# Regtools
-Regtools is a project by The Griffith Lab at the McDonnell Genome Institute.
+# RegTools
+RegTools is a project by The Griffith Lab at the McDonnell Genome Institute.
 The source for the project is on [Github.](https://github.com/griffithlab/regtools)
 
 ##License

diff --git a/docs/index.md b/docs/index.md
@@ -1,6 +1,10 @@
-# regtools
+# RegTools
 
+<<<<<<< HEAD
+RegTools is a set of tools that integrate DNA-seq and RNA-seq data to help interpret mutations in a regulatory and splicing context.
+=======
 regtools is a set of tools that integrate DNA-seq and RNA-seq data to help interpret mutations in a regulatory and splicing context. You can find the source code at our [GitHub repository](https://github.com/griffithlab/regtools) or just use our [Docker image](https://hub.docker.com/r/griffithlab/regtools/) without need for installation.
+>>>>>>> 1f998a6848ebc8fabb738d75dd1bd2413ca9b6b4
 
 ##Features
 
@@ -25,7 +29,7 @@ Clone and install regtools by running:
 ```
     regtools --help
 ```
-For information about the individual regtools commands, please see [the Commands page](commands/commands.md)
+For information about the individual RegTools commands, please see [the Commands page](commands/commands.md)
 
 ##Contribute
 
@@ -40,7 +44,7 @@ Github issues are another option to contact the project about potential bugs.
 
 ##Acknowledgements
 
-regtools uses several open-source libraries. We would like to thank the
+RegTools uses several open-source libraries. We would like to thank the
 developers of htslib and bedtools. We would also like to thank Travis Abbott for
 useful comments and code.