Initial adding Game of Life Module
Merge branch 'life' into develop
Update OpenMP pattern lets, restructure, add pattern nomenclature and diagram.
Merge branch 'ls-dev' into develop
Merge branch 'develop'
Updates to Drug Design and Pandemic modules for SIGCSE 14 workshop
Merge branch 'ls-dev' into develop
Changes to Drug Design and Pandemic-OpenMP ready
moved Drug Design and Pandemic without MPI to modules from dev/modules
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 'master' into d/leesn

Merged in with Master.
Merge branch 'd/leesn' of https://github.com/libbyshoop/csinparallel into d/leesn

Merged in my previous mistake.