Merge pull request #1 from KellyBlack/dev

Dev
Merge pull request #1 from KellyBlack/dev

Dev
Created initial simulation directories.

data, matlab, R
Linton's change
Merge pull request #2 from KellyBlack/dev

update bethdev
first version of matlab function for Z and X
Merge pull request #6 from sweenee/beth_dev

pulling Dev into Beth_dev before pulling my code into Dev
remove end and initialize Q
Deer simulation
deerSim update
deerSim update
Analytic Solutions to Z and X

no for loop
cumsum for integral part of solution
Merge pull request #3 from sweenee/beth_dev

Updating Sweenee Dev from Beth_Dev
Merge pull request #4 from KellyBlack/dev

Merge Kelly Black Dev to Sweenee Dev
Merge pull request #8 from sweenee/dev

Fixed the analytic solution file for DeerPop
Merge remote-tracking branch 'origin/dev' into linton_dev

Conflicts:
	simulations/R/readme.txt
Merge pull request #9 from lindongzhou/linton_dev

Linton dev
Merge pull request #3 from KellyBlack/dev

Dev
Merge remote-tracking branch 'origin/dev' into candace_dev