Merge branch 'master' of github.com:briandconnelly/BEACONToolkit

Conflicts: analysis/doc/analysis.md
beacon-center · Aug 6, 2012 · 4f81778 · 4f81778
2 parents 2c30039 + adf61f4
commit 4f81778
Show file tree

Hide file tree

Showing 41 changed files with 875 additions and 18,448 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ and ecology.
 
 ## Sections
 * Working with CSV datasets (Excel, R, Python)
-* Statistical analysis (Excel, R, Python)
+* Statistical analysis (R, Python)
 
 ## License
 

diff --git a/analysis/data/LOD_Data/run10LOD.csv b/analysis/data/LOD_Data/run10LOD.csv
diff --git a/analysis/data/LOD_Data/run11LOD.csv b/analysis/data/LOD_Data/run11LOD.csv
diff --git a/analysis/data/LOD_Data/run12LOD.csv b/analysis/data/LOD_Data/run12LOD.csv
diff --git a/analysis/data/LOD_Data/run13LOD.csv b/analysis/data/LOD_Data/run13LOD.csv
diff --git a/analysis/data/LOD_Data/run14LOD.csv b/analysis/data/LOD_Data/run14LOD.csv
diff --git a/analysis/data/LOD_Data/run15LOD.csv b/analysis/data/LOD_Data/run15LOD.csv
diff --git a/analysis/data/LOD_Data/run16LOD.csv b/analysis/data/LOD_Data/run16LOD.csv
diff --git a/analysis/data/LOD_Data/run17LOD.csv b/analysis/data/LOD_Data/run17LOD.csv
diff --git a/analysis/data/LOD_Data/run18LOD.csv b/analysis/data/LOD_Data/run18LOD.csv
diff --git a/analysis/data/LOD_Data/run19LOD.csv b/analysis/data/LOD_Data/run19LOD.csv
diff --git a/analysis/data/LOD_Data/run1LOD.csv b/analysis/data/LOD_Data/run1LOD.csv
diff --git a/analysis/data/LOD_Data/run20LOD.csv b/analysis/data/LOD_Data/run20LOD.csv
diff --git a/analysis/data/LOD_Data/run21LOD.csv b/analysis/data/LOD_Data/run21LOD.csv
diff --git a/analysis/data/LOD_Data/run22LOD.csv b/analysis/data/LOD_Data/run22LOD.csv
diff --git a/analysis/data/LOD_Data/run23LOD.csv b/analysis/data/LOD_Data/run23LOD.csv
diff --git a/analysis/data/LOD_Data/run24LOD.csv b/analysis/data/LOD_Data/run24LOD.csv
diff --git a/analysis/data/LOD_Data/run25LOD.csv b/analysis/data/LOD_Data/run25LOD.csv
diff --git a/analysis/data/LOD_Data/run26LOD.csv b/analysis/data/LOD_Data/run26LOD.csv
diff --git a/analysis/data/LOD_Data/run27LOD.csv b/analysis/data/LOD_Data/run27LOD.csv
diff --git a/analysis/data/LOD_Data/run28LOD.csv b/analysis/data/LOD_Data/run28LOD.csv
diff --git a/analysis/data/LOD_Data/run29LOD.csv b/analysis/data/LOD_Data/run29LOD.csv
diff --git a/analysis/data/LOD_Data/run2LOD.csv b/analysis/data/LOD_Data/run2LOD.csv
diff --git a/analysis/data/LOD_Data/run30LOD.csv b/analysis/data/LOD_Data/run30LOD.csv
diff --git a/analysis/data/LOD_Data/run3LOD.csv b/analysis/data/LOD_Data/run3LOD.csv
diff --git a/analysis/data/LOD_Data/run4LOD.csv b/analysis/data/LOD_Data/run4LOD.csv
diff --git a/analysis/data/LOD_Data/run5LOD.csv b/analysis/data/LOD_Data/run5LOD.csv
diff --git a/analysis/data/LOD_Data/run6LOD.csv b/analysis/data/LOD_Data/run6LOD.csv
diff --git a/analysis/data/LOD_Data/run7LOD.csv b/analysis/data/LOD_Data/run7LOD.csv
diff --git a/analysis/data/LOD_Data/run8LOD.csv b/analysis/data/LOD_Data/run8LOD.csv
diff --git a/analysis/data/LOD_Data/run9LOD.csv b/analysis/data/LOD_Data/run9LOD.csv