Merge branch 'ls-dev' into develop
merge fixes
changed some incorrect instructions back
more updates and testing of process
Modified all of my modules to back the way they were before Dani's merge.
removing corrupted Pandemic file
Merge branch 'develop' of https://github.com/libbyshoop/csinparallel into develop

Conflicts:
	dev/modules/Pandemic/source/conf.py
	dev/modules/Pandemic/source/index.rst
removing Pandemic module
initial adding Pandemic, PandemicWithMPI and PandemicWithoutMPI modules
Merge branch 'Pandemic-No-MPI' into develop
initial adding Pandemic module
Merge branch 'Pandemic' into develop
Delete Pandemic Module Second Time
initial adding Pandemic Module
Merge branch 'Pandemic' into develop
fixing Pandemic modules build directory
adding Pandemic modules with rebuild html
Merge branch 'Pandemic' into develop
Area under the Curve First Version
moving Area under the curve from modules folder to dev/modules