documentation started
fixed hysteresis, irm, jr6
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/build/doctrees/RockPy.Functions.doctree
	doc/build/doctrees/RockPy.Measurements.doctree
	doc/build/doctrees/RockPy.Plotting.doctree
	doc/build/doctrees/RockPy.Readin.doctree
	doc/build/doctrees/RockPy.Structure.doctree
	doc/build/doctrees/RockPy.Treatments.doctree
	doc/build/doctrees/RockPy.Visualize.doctree
	doc/build/doctrees/RockPy.doctree
	doc/build/doctrees/environment.pickle
	doc/build/doctrees/index.doctree
	doc/build/html/RockPy.Functions.html
	doc/build/html/RockPy.Measurements.html
	doc/build/html/RockPy.Plotting.html
	doc/build/html/RockPy.Readin.html
	doc/build/html/RockPy.Structure.html
	doc/build/html/RockPy.Treatments.html
	doc/build/html/RockPy.Visualize.html
	doc/build/html/RockPy.html
	doc/build/html/_sources/RockPy.Functions.txt
	doc/build/html/_sources/RockPy.Measurements.txt
	doc/build/html/_sources/RockPy.Plotting.txt
	doc/build/html/_sources/RockPy.Readin.txt
	doc/build/html/_sources/RockPy.Structure.txt
	doc/build/html/_sources/RockPy.Treatments.txt
	doc/build/html/_sources/RockPy.Visualize.txt
	doc/build/html/_sources/RockPy.txt
	doc/build/html/_sources/index.txt
	doc/build/html/_static/basic.css
	doc/build/html/_static/bootstrap-2.3.2/css/bootstrap-responsive.css
	doc/build/html/_static/bootstrap-2.3.2/css/bootstrap-responsive.min.css
	doc/build/html/_static/bootstrap-2.3.2/css/bootstrap.css
	doc/build/html/_static/bootstrap-2.3.2/css/bootstrap.min.css
	doc/build/html/_static/bootstrap-2.3.2/js/bootstrap.js
	doc/build/html/_static/bootstrap-2.3.2/js/bootstrap.min.js
	doc/build/html/_static/bootstrap-3.1.0/css/bootstrap-theme.css
	doc/build/html/_static/bootstrap-3.1.0/css/bootstrap-theme.css.map
	doc/build/html/_static/bootstrap-3.1.0/css/bootstrap-theme.min.css
	doc/build/html/_static/bootstrap-3.1.0/css/bootstrap.css
	doc/build/html/_static/bootstrap-3.1.0/css/bootstrap.css.map
	doc/build/html/_static/bootstrap-3.1.0/css/bootstrap.min.css
	doc/build/html/_static/bootstrap-3.1.0/js/bootstrap.js
	doc/build/html/_static/bootstrap-3.1.0/js/bootstrap.min.js
	doc/build/html/_static/bootstrap-sphinx.css
	doc/build/html/_static/bootstrap-sphinx.js
	doc/build/html/_static/bootswatch-2.3.2/amelia/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/cerulean/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/cosmo/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/cyborg/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/flatly/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/journal/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/readable/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/simplex/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/slate/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/spacelab/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/spruce/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/superhero/bootstrap.min.css
	doc/build/html/_static/bootswatch-2.3.2/united/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/amelia/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/cerulean/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/cosmo/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/cupid/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/cyborg/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/flatly/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/journal/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/lumen/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/readable/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/simplex/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/slate/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/spacelab/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/superhero/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/united/bootstrap.min.css
	doc/build/html/_static/bootswatch-3.1.0/yeti/bootstrap.min.css
	doc/build/html/_static/doctools.js
	doc/build/html/_static/jquery.js
	doc/build/html/_static/js/jquery-1.11.0.min.js
	doc/build/html/_static/pygments.css
	doc/build/html/_static/searchtools.js
	doc/build/html/_static/underscore.js
	doc/build/html/_static/websupport.js
	doc/build/html/genindex.html
	doc/build/html/index.html
	doc/build/html/modules.html
	doc/build/html/objects.inv
	doc/build/html/py-modindex.html
	doc/build/html/search.html
	doc/build/html/searchindex.js
	doc/source/RockPy.rst
	doc/source/index.rst
	doc/source/modules.rst
	testing/hysteresis.py
documentation started