restructured and added GRF model

README.md

@@ -1,12 +1,17 @@
 AnaFlow: A python-package containing analytical solutions for groundwater flow
 ==============================================================================
 [![DOI](https://zenodo.org/badge/116264578.svg)](https://zenodo.org/badge/latestdoi/116264578)
+<<<<<<< HEAD
 
 <p align="center">
 <img src="/docs/source/Anaflow.png" alt="AnaFlow-LOGO" width="251px"/>
 </p>
 
 You can find the documentation under: http://anaflow.readthedocs.io
+=======
+[![PyPI version](https://badge.fury.io/py/anaflow.svg)](https://badge.fury.io/py/anaflow)
+[![Documentation Status](https://readthedocs.org/projects/docs/badge/?version=latest)](https://anaflow.readthedocs.io/en/latest/)
+>>>>>>> 6d35523d596e8942c004c35a101a86f83584f18d
 
 Contents
 --------
@@ -67,4 +72,10 @@ Dependencies
  - [SciPy](http://www.scipy.org): 0.19.0 or higher
  - [scikit-umfpack](http://pypi.python.org/pypi/scikit-umfpack): recomended
 
+<<<<<<< HEAD
 Created December 2017, Copyright Sebastian Mueller 2017-2018
+=======
+[![ForTheBadge built-with-science](http://ForTheBadge.com/images/badges/built-with-science.svg)](https://GitHub.com/Naereen/)
+
+Created December 2017, Copyright Sebastian Mueller 2017
+>>>>>>> 6d35523d596e8942c004c35a101a86f83584f18d