removed development modules from master branch
Merge branch 'develop'

Conflicts:
	dev/modules/DrugDesignInParallel/source/go/go.rst
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'

Conflicts:
	modules/DrugDesignExemplar/Makefile
	modules/DrugDesignExemplar/build/html/_downloads/dd_serial.cpp
	modules/DrugDesignExemplar/build/html/_images/proteinligand.jpg
	modules/DrugDesignExemplar/build/html/_images/seq1.jpg
	modules/DrugDesignExemplar/build/html/_images/seq2.jpg
	modules/DrugDesignExemplar/build/html/_sources/intro/intro.txt

modules/DrugDesignExemplar/build/html/_sources/sequentialimplementation/
sequentialimplementation.txt
	modules/DrugDesignExemplar/make.bat
	modules/DrugDesignExemplar/source/_static/default.css_t
	modules/DrugDesignExemplar/source/conf.py

modules/DrugDesignExemplar/source/sequentialimplementation/code/dd_seria
l.cpp

modules/DrugDesignExemplar/source/sequentialimplementation/sequencesaste
xt.txt
	modules/DrugDesignInParallel/Makefile
	modules/DrugDesignInParallel/build/html/_downloads/dd_boost.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_boost1.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_boost2.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_go.go
	modules/DrugDesignInParallel/build/html/_downloads/dd_go1.go
	modules/DrugDesignInParallel/build/html/_downloads/dd_hadoop.java
	modules/DrugDesignInParallel/build/html/_downloads/dd_hadoop1.java
	modules/DrugDesignInParallel/build/html/_downloads/dd_omp.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_omp1.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_omp2.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_serial.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_serial1.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_serial2.cpp
	modules/DrugDesignInParallel/build/html/_downloads/dd_serial3.cpp

modules/DrugDesignInParallel/build/html/_sources/boostthreads/boostthrea
ds.txt
	modules/DrugDesignInParallel/build/html/_sources/hadoop/hadoop.txt

modules/DrugDesignInParallel/build/html/_sources/lookingahead/lookingahe
ad.txt
	modules/DrugDesignInParallel/make.bat
	modules/DrugDesignInParallel/source/_static/default.css_t
	modules/DrugDesignInParallel/source/boostthreads/code/dd_boost.cpp
	modules/DrugDesignInParallel/source/boostthreads/code/dd_omp.cpp
	modules/DrugDesignInParallel/source/conf.py
	modules/DrugDesignInParallel/source/evaluation/code/dd_go.go
	modules/DrugDesignInParallel/source/evaluation/code/dd_omp.cpp
	modules/DrugDesignInParallel/source/evaluation/evaluation.rst
	modules/DrugDesignInParallel/source/index.rst
	modules/DrugDesignInParallel/source/openmp/openmp.rst
Typos the Rick Ord found.
Typos, change to seconds for opm_get_wtime print ; from Rick Ord
One more typo in Multicore Programming
Fixes to Multicore Programming to have a bit less emphasis on MTL, but not totally removed.
Added latex pdf and word docs to Pandemic without MPI build
had to fix Makefile for PandemicWithoutMPI to make the latex tar ball
Fixed several minor bugs.
Merge branch 'develop'

Conflicts:

dev/modules/CUDAGameOfLife/build/doctrees/ExampleProgramsAndLabs/Example
ProgramsAndLabs.doctree

dev/modules/CUDAGameOfLife/build/doctrees/Introduction/Introduction.doct
ree

dev/modules/CUDAGameOfLife/build/doctrees/PiecesOfThePuzzle/PiecesOfTheP
uzzle.doctree
	dev/modules/CUDAGameOfLife/build/doctrees/environment.pickle
	dev/modules/CUDAGameOfLife/build/doctrees/index.doctree
	dev/modules/CUDAGameOfLife/build/html/.buildinfo

dev/modules/CUDAGameOfLife/build/html/ExampleProgramsAndLabs/ExampleProg
ramsAndLabs.html
	dev/modules/CUDAGameOfLife/build/html/Introduction/Introduction.html

dev/modules/CUDAGameOfLife/build/html/PiecesOfThePuzzle/PiecesOfThePuzzl
e.html

dev/modules/CUDAGameOfLife/build/html/_sources/Introduction/Introduction
.txt

dev/modules/CUDAGameOfLife/build/html/_sources/PiecesOfThePuzzle/PiecesO
fThePuzzle.txt
	dev/modules/CUDAGameOfLife/build/html/_static/basic.css
	dev/modules/CUDAGameOfLife/build/html/_static/doctools.js
	dev/modules/CUDAGameOfLife/build/html/_static/jquery.js
	dev/modules/CUDAGameOfLife/build/html/_static/searchtools.js
	dev/modules/CUDAGameOfLife/build/html/_static/sidebar.js
	dev/modules/CUDAGameOfLife/build/html/_static/underscore.js
	dev/modules/CUDAGameOfLife/build/html/_static/websupport.js
	dev/modules/CUDAGameOfLife/build/html/genindex.html
	dev/modules/CUDAGameOfLife/build/html/index.html
	dev/modules/CUDAGameOfLife/build/html/search.html
	dev/modules/CUDAGameOfLife/build/html/searchindex.js
	dev/modules/CUDAGameOfLife/source/Introduction/Introduction.rst

dev/modules/CUDAGameOfLife/source/PiecesOfThePuzzle/PiecesOfThePuzzle.rs
t
Merge branch 'develop'
Merge branch 'develop'
Spell check of CUDA Architecture
Merge branch 'master' into develop