Rmarkdown test file
Merge branch 'master' of github.com:PermuteSeminar/PermuteSeminar-2014
knitr summary of week 2 class
fix conflicts?

Merge branch 'master' of github.com:PermuteSeminar/PermuteSeminar-2014

Conflicts:
	Week-2/figure/unnamed-chunk-2.png
	Week-2/figure/unnamed-chunk-3.png
Merge branch 'master' of github.com:PermuteSeminar/PermuteSeminar-2014