fixed merge & code for pages

Merge branch 'master' of github.com:dataknut/weGotThePower

# Conflicts:
#	paper/makePages.R

equationTests.Rmd

----
-title: "Equation tests"
-output: html_document
----
-
-```{r setup, include=FALSE}
-knitr::opts_chunk$set(echo = TRUE)
-```
-
-Variance:
-
-$\sigma^{2} = \frac{\sum\limits_{i=1}^{n} \left(x_{i} - \bar{x}\right)^{2}} {n-1}$
-
-Standard deviation:
-
-$\sigma = \sqrt{\frac{\sum\limits_{i=1}^{n} \left(x_{i} - \bar{x}\right)^{2}} {n-1}}$
-
-Margins of error (proportions)
-
-$$me = +/- z * \sqrt{\frac{p(1-p)} {n-1}}$$
\ No newline at end of file

paper/makePages.R

-# run this to knit the .Rmd to an html file in the pages/ directory 
+# run this to knit the .Rmd to an html file in the docs/ directory for github pages
 library(markdown)
 library(bookdown)
 library(dkUtils)
@@ -9,4 +9,5 @@ rmdFile <- paste0(myParams$repoLoc, "/paper/weGotThePower.Rmd")
 rmarkdown::render(input = rmdFile,
                   output_format = "html_document2",
                   output_file = paste0(myParams$repoLoc, "/docs/weGotThePower.html")
+
 )
\ No newline at end of file